denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whitespace cleanups in tnc code

Browse Source
This commit is contained in:
Martin Willi
2011-02-08 11:03:10 +01:00
parent c6c7c7001c
commit 6ccb23e80b
14 changed files with 124 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/tnc_imc/tnc_imc_manager.c
+2 -2
View File
@@ -61,7 +61,7 @@ METHOD(imc_manager_t, add, bool,
this->imcs->insert_last(this->imcs, imc);
this->next_imc_id++;
if (imc->provide_bind_function(imc->get_id(imc), TNC_TNCC_BindFunction)
if (imc->provide_bind_function(imc->get_id(imc), TNC_TNCC_BindFunction)
!= TNC_RESULT_SUCCESS)
{
DBG1(DBG_TNC, "IMC \"%s\" failed to obtain bind function",
@@ -229,7 +229,7 @@ imc_manager_t* tnc_imc_manager_create(void)
.receive_message = _receive_message,
.batch_ending = _batch_ending,
.destroy = _destroy,
},
},
.imcs = linked_list_create(),
.next_imc_id = 1,
);
src/libcharon/plugins/tnc_imv/tnc_imv.c
+14 -14
View File
@@ -108,19 +108,19 @@ METHOD(imv_t, type_supported, bool,
TNC_MessageSubtype msg_subtype, subtype;
int i;
msg_vid = (message_type >> 8) & TNC_VENDORID_ANY;
msg_vid = (message_type >> 8) & TNC_VENDORID_ANY;
msg_subtype = message_type & TNC_SUBTYPE_ANY;
for (i = 0; i < this->type_count; i++)
{
vid = (this->supported_types[i] >> 8) & TNC_VENDORID_ANY;
subtype = this->supported_types[i] & TNC_SUBTYPE_ANY;
vid = (this->supported_types[i] >> 8) & TNC_VENDORID_ANY;
subtype = this->supported_types[i] & TNC_SUBTYPE_ANY;
if (this->supported_types[i] == message_type
if (this->supported_types[i] == message_type
|| (subtype == TNC_SUBTYPE_ANY
&& (msg_vid == vid || vid == TNC_VENDORID_ANY))
|| (vid == TNC_VENDORID_ANY
&& (msg_subtype == subtype || subtype == TNC_SUBTYPE_ANY)))
&& (msg_subtype == subtype || subtype == TNC_SUBTYPE_ANY)))
{
return TRUE;
}
@@ -153,7 +153,7 @@ imv_t* tnc_imv_create(char *name, char *path)
.set_message_types = _set_message_types,
.type_supported = _type_supported,
.destroy = _destroy,
},
},
.name = name,
.path = path,
);
@@ -168,7 +168,7 @@ imv_t* tnc_imv_create(char *name, char *path)
this->public.initialize = dlsym(this->handle, "TNC_IMV_Initialize");
if (!this->public.initialize)
{
{
DBG1(DBG_TNC, "could not resolve TNC_IMV_Initialize in %s: %s\n",
path, dlerror());
dlclose(this->handle);
@@ -177,25 +177,25 @@ imv_t* tnc_imv_create(char *name, char *path)
}
this->public.notify_connection_change =
dlsym(this->handle, "TNC_IMV_NotifyConnectionChange");
this->public.solicit_recommendation =
this->public.solicit_recommendation =
dlsym(this->handle, "TNC_IMV_SolicitRecommendation");
if (!this->public.solicit_recommendation)
{
{
DBG1(DBG_TNC, "could not resolve TNC_IMV_SolicitRecommendation in %s: %s\n",
path, dlerror());
dlclose(this->handle);
free(this);
return NULL;
}
this->public.receive_message =
this->public.receive_message =
dlsym(this->handle, "TNC_IMV_ReceiveMessage");
this->public.batch_ending =
this->public.batch_ending =
dlsym(this->handle, "TNC_IMV_BatchEnding");
this->public.terminate =
this->public.terminate =
dlsym(this->handle, "TNC_IMV_Terminate");
this->public.provide_bind_function =
this->public.provide_bind_function =
dlsym(this->handle, "TNC_IMV_ProvideBindFunction");
if (!this->public.provide_bind_function)
if (!this->public.provide_bind_function)
{
DBG1(DBG_TNC, "could not resolve TNC_IMV_ProvideBindFunction in %s: %s\n",
path, dlerror());
src/libcharon/plugins/tnc_imv/tnc_imv_bind_function.c
+7 -7
View File
@@ -109,29 +109,29 @@ TNC_Result TNC_TNCS_BindFunction(TNC_IMVID id,
{
*function_pointer = (void*)TNC_TNCS_ReportMessageTypes;
}
else if (streq(function_name, "TNC_TNCS_RequestHandshakeRetry"))
else if (streq(function_name, "TNC_TNCS_RequestHandshakeRetry"))
{
*function_pointer = (void*)TNC_TNCS_RequestHandshakeRetry;
}
else if (streq(function_name, "TNC_TNCS_SendMessage"))
else if (streq(function_name, "TNC_TNCS_SendMessage"))
{
*function_pointer = (void*)TNC_TNCS_SendMessage;
}
else if (streq(function_name, "TNC_TNCS_ProvideRecommendation"))
else if (streq(function_name, "TNC_TNCS_ProvideRecommendation"))
{
*function_pointer = (void*)TNC_TNCS_ProvideRecommendation;
}
else if (streq(function_name, "TNC_TNCS_GetAttribute"))
else if (streq(function_name, "TNC_TNCS_GetAttribute"))
{
*function_pointer = (void*)TNC_TNCS_GetAttribute;
}
else if (streq(function_name, "TNC_TNCS_SetAttribute"))
else if (streq(function_name, "TNC_TNCS_SetAttribute"))
{
*function_pointer = (void*)TNC_TNCS_SetAttribute;
}
else
else
{
return TNC_RESULT_INVALID_PARAMETER;
}
return TNC_RESULT_SUCCESS;
return TNC_RESULT_SUCCESS;
}
src/libcharon/plugins/tnc_imv/tnc_imv_manager.c
+2 -2
View File
@@ -68,7 +68,7 @@ METHOD(imv_manager_t, add, bool,
this->imvs->insert_last(this->imvs, imv);
this->next_imv_id++;
if (imv->provide_bind_function(imv->get_id(imv), TNC_TNCS_BindFunction)
if (imv->provide_bind_function(imv->get_id(imv), TNC_TNCS_BindFunction)
!= TNC_RESULT_SUCCESS)
{
DBG1(DBG_TNC, "IMV \"%s\" could failed to obtain bind function",
@@ -280,7 +280,7 @@ imv_manager_t* tnc_imv_manager_create(void)
.receive_message = _receive_message,
.batch_ending = _batch_ending,
.destroy = _destroy,
},
},
.imvs = linked_list_create(),
.next_imv_id = 1,
);
src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c
+1 -1
View File
@@ -393,7 +393,7 @@ recommendations_t* tnc_imv_recommendations_create(linked_list_t *imv_list)
.set_reason_language = _set_reason_language,
.create_reason_enumerator = _create_reason_enumerator,
.destroy = _destroy,
},
},
.recs = linked_list_create(),
);
src/libcharon/plugins/tnccs_11/batch/tnccs_batch.c
+12 -12
View File
@@ -86,13 +86,13 @@ METHOD(tnccs_batch_t, add_msg, void,
METHOD(tnccs_batch_t, build, void,
private_tnccs_batch_t *this)
{
xmlChar *xmlbuf;
int buf_size;
xmlChar *xmlbuf;
int buf_size;
xmlDocDumpFormatMemory(this->doc, &xmlbuf, &buf_size, 1);
this->encoding = chunk_create((u_char*)xmlbuf, buf_size);
this->encoding = chunk_clone(this->encoding);
xmlFree(xmlbuf);
this->encoding = chunk_clone(this->encoding);
xmlFree(xmlbuf);
}
METHOD(tnccs_batch_t, process, status_t,
@@ -101,9 +101,9 @@ METHOD(tnccs_batch_t, process, status_t,
tnccs_msg_t *tnccs_msg, *msg;
tnccs_error_type_t error_type = TNCCS_ERROR_OTHER;
char *error_msg, buf[BUF_LEN];
xmlNodePtr cur;
xmlNsPtr ns;
xmlChar *batchid, *recipient;
xmlNodePtr cur;
xmlNsPtr ns;
xmlChar *batchid, *recipient;
int batch_id;
this->doc = xmlParseMemory(this->encoding.ptr, this->encoding.len);
@@ -116,7 +116,7 @@ METHOD(tnccs_batch_t, process, status_t,
/* check out the XML document */
cur = xmlDocGetRootElement(this->doc);
if (!cur)
if (!cur)
{
error_type = TNCCS_ERROR_MALFORMED_BATCH;
error_msg = "empty XML document";
@@ -141,12 +141,12 @@ METHOD(tnccs_batch_t, process, status_t,
snprintf(buf, BUF_LEN, "wrong XML document type '%s', expected TNCCS-Batch",
cur->name);
goto fatal;
}
}
/* check presence of BatchID property */
batchid = xmlGetProp(cur, (const xmlChar*)"BatchId");
if (!batchid)
{
{
error_type = TNCCS_ERROR_INVALID_BATCH_ID;
error_msg = "BatchId is missing";
goto fatal;
@@ -180,7 +180,7 @@ METHOD(tnccs_batch_t, process, status_t,
error_msg = buf;
snprintf(buf, BUF_LEN, "message recipient expected '%s', got '%s'",
this->is_server ? "TNCS" : "TNCC", (char*)recipient);
xmlFree(recipient);
xmlFree(recipient);
goto fatal;
}
xmlFree(recipient);
@@ -247,7 +247,7 @@ METHOD(tnccs_batch_t, destroy, void,
offsetof(tnccs_msg_t, destroy));
this->errors->destroy_offset(this->errors,
offsetof(tnccs_msg_t, destroy));
xmlFreeDoc(this->doc);
xmlFreeDoc(this->doc);
free(this->encoding.ptr);
free(this);
}
src/libcharon/plugins/tnccs_11/messages/imc_imv_msg.c
+4 -4
View File
@@ -183,15 +183,15 @@ tnccs_msg_t *imc_imv_msg_create_from_node(xmlNodePtr node, linked_list_t *errors
if (streq((char*)cur->name, "Type") && cur->ns == ns)
{
content = xmlNodeGetContent(cur);
this->msg_type = strtoul((char*)content, NULL, 16);
xmlFree(content);
this->msg_type = strtoul((char*)content, NULL, 16);
xmlFree(content);
}
else if (streq((char*)cur->name, "Base64") && cur->ns == ns)
{
content = xmlNodeGetContent(cur);
b64_body = chunk_create((char*)content, strlen((char*)content));
this->msg_body = decode_base64(b64_body);
xmlFree(content);
xmlFree(content);
}
cur = cur->next;
}
@@ -220,7 +220,7 @@ tnccs_msg_t *imc_imv_msg_create(TNC_MessageType msg_type, chunk_t msg_body)
.get_msg_body = _get_msg_body,
},
.type = IMC_IMV_MSG,
.node = xmlNewNode(NULL, BAD_CAST "IMC-IMV-Message"),
.node = xmlNewNode(NULL, BAD_CAST "IMC-IMV-Message"),
.msg_type = msg_type,
.msg_body = chunk_clone(msg_body),
);
src/libcharon/plugins/tnccs_11/messages/tnccs_msg.c
+6 -6
View File
@@ -59,10 +59,10 @@ tnccs_msg_t* tnccs_msg_create_from_node(xmlNodePtr node, linked_list_t *errors)
{
if (streq((char*)cur->name, "Type") && cur->ns == ns)
{
xmlChar *content = xmlNodeGetContent(cur);
xmlChar *content = xmlNodeGetContent(cur);
type = strtol((char*)content, NULL, 16);
xmlFree(content);
type = strtol((char*)content, NULL, 16);
xmlFree(content);
found = TRUE;
}
else if (streq((char*)cur->name, "XML") && cur->ns == ns)
@@ -83,12 +83,12 @@ tnccs_msg_t* tnccs_msg_create_from_node(xmlNodePtr node, linked_list_t *errors)
}
cur = xml_msg_node;
/* skip empty and blank nodes */
while (cur && xmlIsBlankNode(cur))
/* skip empty and blank nodes */
while (cur && xmlIsBlankNode(cur))
{
cur = cur->next;
}
if (!cur)
if (!cur)
{
error_msg = "XML node is empty";
goto fatal;
src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c
+5 -5
View File
@@ -139,11 +139,11 @@ tnccs_msg_t *tnccs_reason_strings_msg_create(chunk_t reason, chunk_t language)
n2 = xmlNewNode(NULL, BAD_CAST enum_to_name(tnccs_msg_type_names, this->type));
/* could add multiple reasons here, if we had them */
n3 = xmlNewNode(NULL, BAD_CAST "ReasonString");
xmlNewProp(n3, BAD_CAST "xml:lang", BAD_CAST this->language.ptr);
xmlNodeSetContent(n3, BAD_CAST this->reason.ptr);
xmlAddChild(n2, n3);
/* could add multiple reasons here, if we had them */
n3 = xmlNewNode(NULL, BAD_CAST "ReasonString");
xmlNewProp(n3, BAD_CAST "xml:lang", BAD_CAST this->language.ptr);
xmlNodeSetContent(n3, BAD_CAST this->reason.ptr);
xmlAddChild(n2, n3);
return &this->public.tnccs_msg_interface;
}
src/libcharon/plugins/tnccs_11/messages/tnccs_recommendation_msg.c
+1 -1
View File
@@ -178,7 +178,7 @@ tnccs_msg_t *tnccs_recommendation_msg_create(TNC_IMV_Action_Recommendation rec)
}
n2 = xmlNewNode(NULL, BAD_CAST enum_to_name(tnccs_msg_type_names, this->type));
xmlNewProp(n2, BAD_CAST "type", BAD_CAST rec_string);
xmlNewProp(n2, BAD_CAST "type", BAD_CAST rec_string);
xmlNodeSetContent(n2, "");
xmlAddChild(n, n2);
src/libcharon/plugins/tnccs_20/messages/pb_tnc_msg.h
+3 -3
View File
@@ -54,9 +54,9 @@ extern enum_name_t *pb_tnc_msg_type_names;
*/
struct pb_tnc_msg_info_t {
u_int32_t min_size;
bool exact_size;
bool in_result_batch;
bool has_noskip_flag;
bool exact_size;
bool in_result_batch;
bool has_noskip_flag;
};
#define TRUE_OR_FALSE 2
src/libcharon/plugins/tnccs_20/tnccs_20.c
+2 -2
View File
@@ -92,8 +92,8 @@ METHOD(tnccs_t, send_msg, void,
TNC_UInt32 msg_len,
TNC_MessageType msg_type)
{
TNC_MessageSubtype msg_sub_type;
TNC_VendorID msg_vendor_id;
TNC_MessageSubtype msg_sub_type;
TNC_VendorID msg_vendor_id;
pb_tnc_msg_t *pb_tnc_msg;
pb_tnc_batch_type_t batch_type;
src/libcharon/tnc/tncifimv.h
+45 -46
View File
@@ -59,71 +59,70 @@ typedef TNC_UInt32 TNC_IMV_Action_Recommendation;
typedef TNC_UInt32 TNC_IMV_Evaluation_Result;
typedef TNC_UInt32 TNC_AttributeID;
/* Function pointers */
typedef TNC_Result (*TNC_IMV_InitializePointer)(
TNC_IMVID imvID,
TNC_Version minVersion,
TNC_Version maxVersion,
TNC_Version *pOutActualVersion);
TNC_IMVID imvID,
TNC_Version minVersion,
TNC_Version maxVersion,
TNC_Version *pOutActualVersion);
typedef TNC_Result (*TNC_IMV_NotifyConnectionChangePointer)(
TNC_IMVID imvID,
TNC_ConnectionID connectionID,
TNC_ConnectionState newState);
TNC_IMVID imvID,
TNC_ConnectionID connectionID,
TNC_ConnectionState newState);
typedef TNC_Result (*TNC_IMV_ReceiveMessagePointer)(
TNC_IMVID imvID,
TNC_ConnectionID connectionID,
TNC_BufferReference message,
TNC_UInt32 messageLength,
TNC_MessageType messageType);
TNC_IMVID imvID,
TNC_ConnectionID connectionID,
TNC_BufferReference message,
TNC_UInt32 messageLength,
TNC_MessageType messageType);
typedef TNC_Result (*TNC_IMV_SolicitRecommendationPointer)(
TNC_IMVID imvID,
TNC_ConnectionID connectionID);
TNC_IMVID imvID,
TNC_ConnectionID connectionID);
typedef TNC_Result (*TNC_IMV_BatchEndingPointer)(
TNC_IMVID imvID,
TNC_ConnectionID connectionID);
TNC_IMVID imvID,
TNC_ConnectionID connectionID);
typedef TNC_Result (*TNC_IMV_TerminatePointer)(
TNC_IMVID imvID);
TNC_IMVID imvID);
typedef TNC_Result (*TNC_TNCS_ReportMessageTypesPointer)(
TNC_IMVID imvID,
TNC_MessageTypeList supportedTypes,
TNC_UInt32 typeCount);
TNC_IMVID imvID,
TNC_MessageTypeList supportedTypes,
TNC_UInt32 typeCount);
typedef TNC_Result (*TNC_TNCS_SendMessagePointer)(
TNC_IMVID imvID,
TNC_ConnectionID connectionID,
TNC_BufferReference message,
TNC_UInt32 messageLength,
TNC_MessageType messageType);
TNC_IMVID imvID,
TNC_ConnectionID connectionID,
TNC_BufferReference message,
TNC_UInt32 messageLength,
TNC_MessageType messageType);
typedef TNC_Result (*TNC_TNCS_RequestHandshakeRetryPointer)(
TNC_IMVID imvID,
TNC_ConnectionID connectionID,
TNC_RetryReason reason);
TNC_IMVID imvID,
TNC_ConnectionID connectionID,
TNC_RetryReason reason);
typedef TNC_Result (*TNC_TNCS_ProvideRecommendationPointer)(
TNC_IMVID imvID,
TNC_ConnectionID connectionID,
TNC_IMV_Action_Recommendation recommendation,
TNC_IMV_Evaluation_Result evaluation);
TNC_IMVID imvID,
TNC_ConnectionID connectionID,
TNC_IMV_Action_Recommendation recommendation,
TNC_IMV_Evaluation_Result evaluation);
typedef TNC_Result (*TNC_TNCS_GetAttributePointer)(
TNC_IMVID imvID,
TNC_IMVID imvID,
TNC_ConnectionID connectionID,
TNC_AttributeID attributeID,
TNC_UInt32 bufferLength,
TNC_BufferReference buffer,
TNC_UInt32 *pOutValueLength);
TNC_UInt32 bufferLength,
TNC_BufferReference buffer,
TNC_UInt32 *pOutValueLength);
typedef TNC_Result (*TNC_TNCS_SetAttributePointer)(
TNC_IMVID imvID,
TNC_ConnectionID connectionID,
TNC_IMVID imvID,
TNC_ConnectionID connectionID,
TNC_AttributeID attributeID,
TNC_UInt32 bufferLength,
TNC_BufferReference buffer);
TNC_UInt32 bufferLength,
TNC_BufferReference buffer);
typedef TNC_Result (*TNC_TNCS_BindFunctionPointer)(
TNC_IMVID imvID,
char *functionName,
void **pOutfunctionPointer);
TNC_IMVID imvID,
char *functionName,
void **pOutfunctionPointer);
typedef TNC_Result (*TNC_IMV_ProvideBindFunctionPointer)(
TNC_IMVID imvID,
TNC_TNCS_BindFunctionPointer bindFunction);
TNC_IMVID imvID,
TNC_TNCS_BindFunctionPointer bindFunction);
/* Version Numbers */