Skip to content

Commit

Permalink
cdp_avp: clang-format for coherent indentation and coding style
Browse files Browse the repository at this point in the history
  • Loading branch information
@linuxmaniac
linuxmaniac committed May 18, 2023
1 parent bda0a6b commit 5c4d243
Show file tree
Hide file tree
Showing 24 changed files with 4,600 additions and 2,439 deletions.
75 changes: 45 additions & 30 deletions src/modules/cdp_avp/avp_add.c
View file
Expand Up @@ -55,22 +55,29 @@ extern struct cdp_binds *cdp;
* @param data_do
* @return
*/
inline int cdp_avp_add_new_to_list(AAA_AVP_LIST *list,int avp_code,int avp_flags,int avp_vendorid,str data,AVPDataStatus data_do)
inline int cdp_avp_add_new_to_list(AAA_AVP_LIST *list, int avp_code,
int avp_flags, int avp_vendorid, str data, AVPDataStatus data_do)
{
AAA_AVP *avp = cdp_avp_new(avp_code,avp_flags,avp_vendorid,data,data_do);
if (!list){
LOG(L_ERR,"Failed adding to NULL list AVP with Code [%d] Flags [%d] VendorID [%d] from data of length [%d]!\n",
avp_code,avp_flags,avp_vendorid,data.len);
if (avp) cdp->AAAFreeAVP(&avp);
AAA_AVP *avp =
cdp_avp_new(avp_code, avp_flags, avp_vendorid, data, data_do);
if(!list) {
LOG(L_ERR,
"Failed adding to NULL list AVP with Code [%d] Flags [%d] "
"VendorID [%d] from data of length [%d]!\n",
avp_code, avp_flags, avp_vendorid, data.len);
if(avp)
cdp->AAAFreeAVP(&avp);
return 0;
}
if (!avp){
LOG(L_ERR,"Error creating AVP with Code [%d] Flags [%d] VendorID [%d] from data of length [%d]!\n",
avp_code,avp_flags,avp_vendorid,data.len);
if(!avp) {
LOG(L_ERR,
"Error creating AVP with Code [%d] Flags [%d] VendorID [%d] "
"from data of length [%d]!\n",
avp_code, avp_flags, avp_vendorid, data.len);
return 0;
}
cdp->AAAAddAVPToList(list,avp);
return 1;
cdp->AAAAddAVPToList(list, avp);
return 1;
}

/**
Expand All @@ -84,14 +91,18 @@ inline int cdp_avp_add_new_to_list(AAA_AVP_LIST *list,int avp_code,int avp_flags
* @param data_do
* @return 1 on success or 0 on failure
*/
inline int cdp_avp_add_new_to_msg(AAAMessage *msg,int avp_code,int avp_flags,int avp_vendorid,str data,AVPDataStatus data_do)
inline int cdp_avp_add_new_to_msg(AAAMessage *msg, int avp_code, int avp_flags,
int avp_vendorid, str data, AVPDataStatus data_do)
{
if (!msg){
LOG(L_ERR,"Failed adding to NULL message AVP with Code [%d] Flags [%d] VendorID [%d] from data of length [%d]!\n",
avp_code,avp_flags,avp_vendorid,data.len);
if(!msg) {
LOG(L_ERR,
"Failed adding to NULL message AVP with Code [%d] Flags [%d] "
"VendorID [%d] from data of length [%d]!\n",
avp_code, avp_flags, avp_vendorid, data.len);
return 0;
}
return cdp_avp_add_new_to_list(&(msg->avpList),avp_code,avp_flags,avp_vendorid,data,data_do);
return cdp_avp_add_new_to_list(
&(msg->avpList), avp_code, avp_flags, avp_vendorid, data, data_do);
}

/**
Expand All @@ -101,19 +112,21 @@ inline int cdp_avp_add_new_to_msg(AAAMessage *msg,int avp_code,int avp_flags,int
* @param avp
* @return 1 on success or 0 on failure
*/
inline int cdp_avp_add_to_list(AAA_AVP_LIST *list,AAA_AVP *avp)
inline int cdp_avp_add_to_list(AAA_AVP_LIST *list, AAA_AVP *avp)
{
if (!avp){
LOG(L_ERR,"Can not add NULL AVP to list!\n");
if(!avp) {
LOG(L_ERR, "Can not add NULL AVP to list!\n");
return 0;
}
if (!list){
LOG(L_ERR,"Failed adding to NULL list AVP with Code [%d] Flags [%d] VendorID [%d] from data of length [%d]!\n",
avp->code,avp->flags,avp->vendorId,avp->data.len);
}
if(!list) {
LOG(L_ERR,
"Failed adding to NULL list AVP with Code [%d] Flags [%d] "
"VendorID [%d] from data of length [%d]!\n",
avp->code, avp->flags, avp->vendorId, avp->data.len);
return 0;
}
cdp->AAAAddAVPToList(list,avp);
return 1;
cdp->AAAAddAVPToList(list, avp);
return 1;
}

/**
Expand All @@ -123,12 +136,14 @@ inline int cdp_avp_add_to_list(AAA_AVP_LIST *list,AAA_AVP *avp)
* @param avp
* @return 1 on success or 0 on failure
*/
inline int cdp_avp_add_to_msg(AAAMessage *msg,AAA_AVP *avp)
inline int cdp_avp_add_to_msg(AAAMessage *msg, AAA_AVP *avp)
{
if (!msg){
LOG(L_ERR,"Failed adding to NULL message AVP with Code [%d] Flags [%d] VendorID [%d] from data of length [%d]!\n",
avp->code,avp->flags,avp->vendorId,avp->data.len);
if(!msg) {
LOG(L_ERR,
"Failed adding to NULL message AVP with Code [%d] Flags [%d] "
"VendorID [%d] from data of length [%d]!\n",
avp->code, avp->flags, avp->vendorId, avp->data.len);
return 0;
}
return cdp_avp_add_to_list(&(msg->avpList),avp);
return cdp_avp_add_to_list(&(msg->avpList), avp);
}
36 changes: 21 additions & 15 deletions src/modules/cdp_avp/avp_add.h
View file
Expand Up @@ -43,30 +43,36 @@

#ifndef CDP_AVP_REFERENCE

#include "../cdp/cdp_load.h"
#include "../cdp/cdp_load.h"

int cdp_avp_add_new_to_list(AAA_AVP_LIST *list,int avp_code,int avp_flags,int avp_vendorid,str data,AVPDataStatus data_do);
typedef int (*cdp_avp_add_new_to_list_f)(AAA_AVP_LIST *list,int avp_code,int avp_flags,int avp_vendorid,str data,AVPDataStatus data_do);
int cdp_avp_add_new_to_list(AAA_AVP_LIST *list, int avp_code, int avp_flags,
int avp_vendorid, str data, AVPDataStatus data_do);
typedef int (*cdp_avp_add_new_to_list_f)(AAA_AVP_LIST *list, int avp_code,
int avp_flags, int avp_vendorid, str data, AVPDataStatus data_do);

int cdp_avp_add_new_to_msg(AAAMessage *msg,int avp_code,int avp_flags,int avp_vendorid,str data,AVPDataStatus data_do);
typedef int (*cdp_avp_add_new_to_msg_f)(AAAMessage *msg,int avp_code,int avp_flags,int avp_vendorid,str data,AVPDataStatus data_do);
int cdp_avp_add_new_to_msg(AAAMessage *msg, int avp_code, int avp_flags,
int avp_vendorid, str data, AVPDataStatus data_do);
typedef int (*cdp_avp_add_new_to_msg_f)(AAAMessage *msg, int avp_code,
int avp_flags, int avp_vendorid, str data, AVPDataStatus data_do);

int cdp_avp_add_to_list(AAA_AVP_LIST *list,AAA_AVP *avp);
typedef int (*cdp_avp_add_to_list_f)(AAA_AVP_LIST *list,AAA_AVP *avp);
int cdp_avp_add_to_list(AAA_AVP_LIST *list, AAA_AVP *avp);
typedef int (*cdp_avp_add_to_list_f)(AAA_AVP_LIST *list, AAA_AVP *avp);

int cdp_avp_add_to_msg(AAAMessage *msg,AAA_AVP *avp);
typedef int (*cdp_avp_add_to_msg_f)(AAAMessage *msg,AAA_AVP *avp);
int cdp_avp_add_to_msg(AAAMessage *msg, AAA_AVP *avp);
typedef int (*cdp_avp_add_to_msg_f)(AAAMessage *msg, AAA_AVP *avp);

#else

int basic.add_new_to_list(AAA_AVP_LIST *list,int avp_code,int avp_flags,int avp_vendorid,str data,AVPDataStatus data_do);

int basic.add_new_to_msg(AAAMessage *msg,int avp_code,int avp_flags,int avp_vendorid,str data,AVPDataStatus data_do);
int basic.add_new_to_list(AAA_AVP_LIST *list, int avp_code, int avp_flags,
int avp_vendorid, str data, AVPDataStatus data_do);

int basic.add_to_list(AAA_AVP_LIST *list,AAA_AVP *avp);
int basic.add_new_to_msg(AAAMessage *msg, int avp_code, int avp_flags,
int avp_vendorid, str data, AVPDataStatus data_do);

int basic.add_to_list(AAA_AVP_LIST *list, AAA_AVP *avp);

int basic.add_to_msg(AAAMessage *msg, AAA_AVP *avp);

int basic.add_to_msg(AAAMessage *msg,AAA_AVP *avp);

#endif


Expand Down
55 changes: 36 additions & 19 deletions src/modules/cdp_avp/avp_get.c
View file
Expand Up @@ -51,21 +51,31 @@ extern struct cdp_binds *cdp;
* @param start_avp - avp where to resume. A null value will trigger a restart of the search.
* @return the AAA_AVP* or NULL if not found (anymore)
*/
inline AAA_AVP* cdp_avp_get_next_from_list(AAA_AVP_LIST list,int avp_code,int avp_vendor_id,AAA_AVP *start_avp)
inline AAA_AVP *cdp_avp_get_next_from_list(
AAA_AVP_LIST list, int avp_code, int avp_vendor_id, AAA_AVP *start_avp)
{
AAA_AVP *avp;
if (!start_avp) start_avp = list.head;
else start_avp = start_avp->next;
LOG(L_DBG,"Looking for AVP with code %d vendor id %d startin at avp %p\n",
avp_code,avp_vendor_id,start_avp);

if (!start_avp){
LOG(L_DBG,"Failed finding AVP with Code %d and VendorId %d - Empty list or at end of list\n",avp_code,avp_vendor_id);
if(!start_avp)
start_avp = list.head;
else
start_avp = start_avp->next;
LOG(L_DBG, "Looking for AVP with code %d vendor id %d startin at avp %p\n",
avp_code, avp_vendor_id, start_avp);

if(!start_avp) {
LOG(L_DBG,
"Failed finding AVP with Code %d and VendorId %d - Empty list "
"or at end of list\n",
avp_code, avp_vendor_id);
return 0;
}
avp = cdp->AAAFindMatchingAVPList(list,start_avp,avp_code,avp_vendor_id,AAA_FORWARD_SEARCH);
if (avp==0){
LOG(L_DBG,"Failed finding AVP with Code %d and VendorId %d - at end of list\n",avp_code,avp_vendor_id);
avp = cdp->AAAFindMatchingAVPList(
list, start_avp, avp_code, avp_vendor_id, AAA_FORWARD_SEARCH);
if(avp == 0) {
LOG(L_DBG,
"Failed finding AVP with Code %d and VendorId %d - at end of "
"list\n",
avp_code, avp_vendor_id);
return 0;
}

Expand All @@ -80,9 +90,11 @@ inline AAA_AVP* cdp_avp_get_next_from_list(AAA_AVP_LIST list,int avp_code,int av
* @param start_avp
* @return the AAA_AVP* or NULL if not found (anymore)
*/
inline AAA_AVP* cdp_avp_get_next_from_msg(AAAMessage *msg,int avp_code,int avp_vendor_id,AAA_AVP *start_avp)
inline AAA_AVP *cdp_avp_get_next_from_msg(
AAAMessage *msg, int avp_code, int avp_vendor_id, AAA_AVP *start_avp)
{
return cdp_avp_get_next_from_list(msg->avpList,avp_code,avp_vendor_id,start_avp);
return cdp_avp_get_next_from_list(
msg->avpList, avp_code, avp_vendor_id, start_avp);
}

/**
Expand All @@ -92,9 +104,10 @@ inline AAA_AVP* cdp_avp_get_next_from_msg(AAAMessage *msg,int avp_code,int avp_v
* @param avp_vendor_id
* @return the AAA_AVP* or null if not found
*/
inline AAA_AVP* cdp_avp_get_from_list(AAA_AVP_LIST list,int avp_code,int avp_vendor_id)
inline AAA_AVP *cdp_avp_get_from_list(
AAA_AVP_LIST list, int avp_code, int avp_vendor_id)
{
return cdp_avp_get_next_from_list(list,avp_code,avp_vendor_id,0);
return cdp_avp_get_next_from_list(list, avp_code, avp_vendor_id, 0);
}

/**
Expand All @@ -104,11 +117,15 @@ inline AAA_AVP* cdp_avp_get_from_list(AAA_AVP_LIST list,int avp_code,int avp_ven
* @param avp_vendor_id
* @return the AAA_AVP* or null if not found
*/
inline AAA_AVP* cdp_avp_get_from_msg(AAAMessage *msg,int avp_code,int avp_vendor_id)
inline AAA_AVP *cdp_avp_get_from_msg(
AAAMessage *msg, int avp_code, int avp_vendor_id)
{
if (!msg){
LOG(L_ERR,"Failed finding AVP with Code %d and VendorId %d in NULL message!\n",avp_code,avp_vendor_id);
if(!msg) {
LOG(L_ERR,
"Failed finding AVP with Code %d and VendorId %d in NULL "
"message!\n",
avp_code, avp_vendor_id);
return 0;
}
return cdp_avp_get_from_list(msg->avpList,avp_code,avp_vendor_id);
return cdp_avp_get_from_list(msg->avpList, avp_code, avp_vendor_id);
}
43 changes: 26 additions & 17 deletions src/modules/cdp_avp/avp_get.h
View file
Expand Up @@ -43,32 +43,41 @@

#ifndef CDP_AVP_REFERENCE

#include "../cdp/cdp_load.h"
#include "../cdp/cdp_load.h"

AAA_AVP* cdp_avp_get_next_from_list(AAA_AVP_LIST list,int avp_code,int avp_vendor_id,AAA_AVP *start_avp);
typedef AAA_AVP* (*cdp_avp_get_next_from_list_f)(AAA_AVP_LIST list,int avp_code,int avp_vendor_id,AAA_AVP *start_avp);

AAA_AVP* cdp_avp_get_next_from_msg(AAAMessage *msg,int avp_code,int avp_vendor_id,AAA_AVP *start_avp);
typedef AAA_AVP* (*cdp_avp_get_next_from_msg_f)(AAAMessage *msg,int avp_code,int avp_vendor_id,AAA_AVP *start_avp);

AAA_AVP* cdp_avp_get_from_list(AAA_AVP_LIST list,int avp_code,int avp_vendor_id);
typedef AAA_AVP* (*cdp_avp_get_from_list_f)(AAA_AVP_LIST list,int avp_code,int avp_vendor_id);

AAA_AVP* cdp_avp_get_from_msg(AAAMessage *msg,int avp_code,int avp_vendor_id);
typedef AAA_AVP* (*cdp_avp_get_from_msg_f)(AAAMessage *msg,int avp_code,int avp_vendor_id);
AAA_AVP *cdp_avp_get_next_from_list(
AAA_AVP_LIST list, int avp_code, int avp_vendor_id, AAA_AVP *start_avp);
typedef AAA_AVP *(*cdp_avp_get_next_from_list_f)(
AAA_AVP_LIST list, int avp_code, int avp_vendor_id, AAA_AVP *start_avp);

AAA_AVP *cdp_avp_get_next_from_msg(
AAAMessage *msg, int avp_code, int avp_vendor_id, AAA_AVP *start_avp);
typedef AAA_AVP *(*cdp_avp_get_next_from_msg_f)(
AAAMessage *msg, int avp_code, int avp_vendor_id, AAA_AVP *start_avp);

AAA_AVP *cdp_avp_get_from_list(
AAA_AVP_LIST list, int avp_code, int avp_vendor_id);
typedef AAA_AVP *(*cdp_avp_get_from_list_f)(
AAA_AVP_LIST list, int avp_code, int avp_vendor_id);

AAA_AVP *cdp_avp_get_from_msg(AAAMessage *msg, int avp_code, int avp_vendor_id);
typedef AAA_AVP *(*cdp_avp_get_from_msg_f)(
AAAMessage *msg, int avp_code, int avp_vendor_id);

#else

AAA_AVP* basic.get_next_from_list(AAA_AVP_LIST list,int avp_code,int avp_vendor_id,AAA_AVP *start_avp);
AAA_AVP *basic.get_next_from_list(
AAA_AVP_LIST list, int avp_code, int avp_vendor_id, AAA_AVP *start_avp);

AAA_AVP* basic.get_next_from_msg(AAAMessage *msg,int avp_code,int avp_vendor_id,AAA_AVP *start_avp);
AAA_AVP *basic.get_next_from_msg(
AAAMessage *msg, int avp_code, int avp_vendor_id, AAA_AVP *start_avp);

AAA_AVP* basic.get_from_list(AAA_AVP_LIST list,int avp_code,int avp_vendor_id);
AAA_AVP *basic.get_from_list(
AAA_AVP_LIST list, int avp_code, int avp_vendor_id);

AAA_AVP* basic.get_from_msg(AAAMessage *msg,int avp_code,int avp_vendor_id);
AAA_AVP *basic.get_from_msg(AAAMessage *msg, int avp_code, int avp_vendor_id);

#endif



#endif /* __AVP_NEW_H */

0 comments on commit 5c4d243

Please sign in to comment.