From 0b273cebbe6fa533e57f177fd403d057d43388f3 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 17 May 2023 16:36:06 +0200 Subject: [PATCH] geoip: clang-format for coherent indentation and coding style --- src/modules/geoip/geoip_mod.c | 66 ++++---- src/modules/geoip/geoip_pv.c | 292 ++++++++++++++++------------------ src/modules/geoip/geoip_pv.h | 4 +- 3 files changed, 169 insertions(+), 193 deletions(-) diff --git a/src/modules/geoip/geoip_mod.c b/src/modules/geoip/geoip_mod.c index 1fed3d92e51..f95ee001d33 100644 --- a/src/modules/geoip/geoip_mod.c +++ b/src/modules/geoip/geoip_mod.c @@ -39,41 +39,36 @@ MODULE_VERSION static char *geoip_path = NULL; -static int mod_init(void); +static int mod_init(void); static void mod_destroy(void); -static int w_geoip_match(struct sip_msg* msg, char* str1, char* str2); +static int w_geoip_match(struct sip_msg *msg, char *str1, char *str2); static int geoip_match(sip_msg_t *msg, str *tomatch, str *pvclass); static pv_export_t mod_pvs[] = { - { {"gip", sizeof("gip")-1}, PVT_OTHER, pv_get_geoip, 0, - pv_parse_geoip_name, 0, 0, 0 }, - { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } -}; + {{"gip", sizeof("gip") - 1}, PVT_OTHER, pv_get_geoip, 0, + pv_parse_geoip_name, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; -static cmd_export_t cmds[]={ - {"geoip_match", (cmd_function)w_geoip_match, 2, fixup_spve_spve, - 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0} -}; +static cmd_export_t cmds[] = {{"geoip_match", (cmd_function)w_geoip_match, 2, + fixup_spve_spve, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0}}; -static param_export_t params[]={ - {"path", PARAM_STRING, &geoip_path}, - {0, 0, 0} -}; +static param_export_t params[] = { + {"path", PARAM_STRING, &geoip_path}, {0, 0, 0}}; struct module_exports exports = { - "geoip", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - mod_pvs, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - mod_destroy /* module destroy function */ + "geoip", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + mod_destroy /* module destroy function */ }; @@ -83,14 +78,12 @@ struct module_exports exports = { static int mod_init(void) { - if(geoip_path==NULL || strlen(geoip_path)==0) - { + if(geoip_path == NULL || strlen(geoip_path) == 0) { LM_ERR("path to GeoIP database file not set\n"); return -1; } - if(geoip_init_pv(geoip_path)!=0) - { + if(geoip_init_pv(geoip_path) != 0) { LM_ERR("cannot init for database file at: %s\n", geoip_path); return -1; } @@ -113,21 +106,21 @@ static int geoip_match(sip_msg_t *msg, str *tomatch, str *pvclass) return geoip_update_pv(tomatch, pvclass); } -static int w_geoip_match(sip_msg_t* msg, char* target, char* pvname) +static int w_geoip_match(sip_msg_t *msg, char *target, char *pvname) { str tomatch = STR_NULL; str pvclass = STR_NULL; - if(msg==NULL) { + if(msg == NULL) { LM_ERR("received null msg\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t*)target, &tomatch)<0) { + if(fixup_get_svalue(msg, (gparam_t *)target, &tomatch) < 0) { LM_ERR("cannot get the address\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t*)pvname, &pvclass)<0) { + if(fixup_get_svalue(msg, (gparam_t *)pvname, &pvclass) < 0) { LM_ERR("cannot get the pv class\n"); return -1; } @@ -150,7 +143,8 @@ static sr_kemi_t sr_kemi_geoip_exports[] = { }; /* clang-format on */ -int mod_register(char *path, int *dlflags, void *p1, void *p2) { - sr_kemi_modules_add(sr_kemi_geoip_exports); - return 0; +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_geoip_exports); + return 0; } diff --git a/src/modules/geoip/geoip_pv.c b/src/modules/geoip/geoip_pv.c index 1821c9b1cec..4abe802dde0 100644 --- a/src/modules/geoip/geoip_pv.c +++ b/src/modules/geoip/geoip_pv.c @@ -34,7 +34,8 @@ #include "geoip_pv.h" -typedef struct _sr_geoip_record { +typedef struct _sr_geoip_record +{ GeoIPRecord *record; char *time_zone; char *region_name; @@ -45,14 +46,16 @@ typedef struct _sr_geoip_record { int flags; } sr_geoip_record_t; -typedef struct _sr_geoip_item { +typedef struct _sr_geoip_item +{ str pvclass; unsigned int hashid; sr_geoip_record_t r; struct _sr_geoip_item *next; } sr_geoip_item_t; -typedef struct _geoip_pv { +typedef struct _geoip_pv +{ sr_geoip_item_t *item; int type; } geoip_pv_t; @@ -66,13 +69,12 @@ sr_geoip_record_t *sr_geoip_get_record(str *name) sr_geoip_item_t *it = NULL; unsigned int hashid = 0; - hashid = get_hash1_raw(name->s, name->len); + hashid = get_hash1_raw(name->s, name->len); it = _sr_geoip_list; - while(it!=NULL) - { - if(it->hashid==hashid && it->pvclass.len == name->len - && strncmp(it->pvclass.s, name->s, name->len)==0) + while(it != NULL) { + if(it->hashid == hashid && it->pvclass.len == name->len + && strncmp(it->pvclass.s, name->s, name->len) == 0) return &it->r; it = it->next; } @@ -84,27 +86,24 @@ sr_geoip_item_t *sr_geoip_add_item(str *name) sr_geoip_item_t *it = NULL; unsigned int hashid = 0; - hashid = get_hash1_raw(name->s, name->len); + hashid = get_hash1_raw(name->s, name->len); it = _sr_geoip_list; - while(it!=NULL) - { - if(it->hashid==hashid && it->pvclass.len == name->len - && strncmp(it->pvclass.s, name->s, name->len)==0) + while(it != NULL) { + if(it->hashid == hashid && it->pvclass.len == name->len + && strncmp(it->pvclass.s, name->s, name->len) == 0) return it; it = it->next; } /* add new */ - it = (sr_geoip_item_t*)pkg_malloc(sizeof(sr_geoip_item_t)); - if(it==NULL) - { + it = (sr_geoip_item_t *)pkg_malloc(sizeof(sr_geoip_item_t)); + if(it == NULL) { LM_ERR("no more pkg\n"); return NULL; } memset(it, 0, sizeof(sr_geoip_item_t)); - it->pvclass.s = (char*)pkg_malloc(name->len+1); - if(it->pvclass.s==NULL) - { + it->pvclass.s = (char *)pkg_malloc(name->len + 1); + if(it->pvclass.s == NULL) { LM_ERR("no more pkg.\n"); pkg_free(it); return NULL; @@ -121,119 +120,121 @@ sr_geoip_item_t *sr_geoip_add_item(str *name) int pv_parse_geoip_name(pv_spec_p sp, str *in) { - geoip_pv_t *gpv=NULL; + geoip_pv_t *gpv = NULL; char *p; str pvc; str pvs; - if(sp==NULL || in==NULL || in->len<=0) + if(sp == NULL || in == NULL || in->len <= 0) return -1; - gpv = (geoip_pv_t*)pkg_malloc(sizeof(geoip_pv_t)); - if(gpv==NULL) + gpv = (geoip_pv_t *)pkg_malloc(sizeof(geoip_pv_t)); + if(gpv == NULL) return -1; memset(gpv, 0, sizeof(geoip_pv_t)); p = in->s; - while(ps+in->len && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r')) + while(p < in->s + in->len + && (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r')) p++; - if(p>in->s+in->len || *p=='\0') + if(p > in->s + in->len || *p == '\0') goto error; pvc.s = p; - while(p < in->s + in->len) - { - if(*p=='=' || *p==' ' || *p=='\t' || *p=='\n' || *p=='\r') + while(p < in->s + in->len) { + if(*p == '=' || *p == ' ' || *p == '\t' || *p == '\n' || *p == '\r') break; p++; } - if(p>in->s+in->len || *p=='\0') + if(p > in->s + in->len || *p == '\0') goto error; pvc.len = p - pvc.s; - if(*p!='=') - { - while(ps+in->len && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r')) + if(*p != '=') { + while(p < in->s + in->len + && (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r')) p++; - if(p>in->s+in->len || *p=='\0' || *p!='=') + if(p > in->s + in->len || *p == '\0' || *p != '=') goto error; } p++; - if(*p!='>') + if(*p != '>') goto error; p++; pvs.len = in->len - (int)(p - in->s); pvs.s = p; - LM_DBG("geoip [%.*s] - key [%.*s]\n", pvc.len, pvc.s, - pvs.len, pvs.s); + LM_DBG("geoip [%.*s] - key [%.*s]\n", pvc.len, pvc.s, pvs.len, pvs.s); gpv->item = sr_geoip_add_item(&pvc); - if(gpv->item==NULL) + if(gpv->item == NULL) goto error; - switch(pvs.len) - { + switch(pvs.len) { case 2: - if(strncmp(pvs.s, "cc", 2)==0) + if(strncmp(pvs.s, "cc", 2) == 0) gpv->type = 0; - else if(strncmp(pvs.s, "tz", 2)==0) + else if(strncmp(pvs.s, "tz", 2) == 0) gpv->type = 1; - else goto error; - break; + else + goto error; + break; case 3: - if(strncmp(pvs.s, "zip", 3)==0) + if(strncmp(pvs.s, "zip", 3) == 0) gpv->type = 2; - else if(strncmp(pvs.s, "lat", 3)==0) + else if(strncmp(pvs.s, "lat", 3) == 0) gpv->type = 3; - else if(strncmp(pvs.s, "lon", 3)==0) + else if(strncmp(pvs.s, "lon", 3) == 0) gpv->type = 4; - else if(strncmp(pvs.s, "dma", 3)==0) + else if(strncmp(pvs.s, "dma", 3) == 0) gpv->type = 5; - else if(strncmp(pvs.s, "ips", 3)==0) + else if(strncmp(pvs.s, "ips", 3) == 0) gpv->type = 6; - else if(strncmp(pvs.s, "ipe", 3)==0) + else if(strncmp(pvs.s, "ipe", 3) == 0) gpv->type = 7; - else goto error; - break; + else + goto error; + break; case 4: - if(strncmp(pvs.s, "city", 4)==0) + if(strncmp(pvs.s, "city", 4) == 0) gpv->type = 8; - else if(strncmp(pvs.s, "area", 4)==0) + else if(strncmp(pvs.s, "area", 4) == 0) gpv->type = 9; - else if(strncmp(pvs.s, "regc", 4)==0) + else if(strncmp(pvs.s, "regc", 4) == 0) gpv->type = 10; - else if(strncmp(pvs.s, "regn", 4)==0) + else if(strncmp(pvs.s, "regn", 4) == 0) gpv->type = 11; - else goto error; - break; + else + goto error; + break; case 5: - if(strncmp(pvs.s, "metro", 5)==0) + if(strncmp(pvs.s, "metro", 5) == 0) gpv->type = 12; - else if(strncmp(pvs.s, "contc", 5)==0) + else if(strncmp(pvs.s, "contc", 5) == 0) gpv->type = 13; - else goto error; - break; + else + goto error; + break; default: goto error; } - sp->pvp.pvn.u.dname = (void*)gpv; + sp->pvp.pvn.u.dname = (void *)gpv; sp->pvp.pvn.type = PV_NAME_OTHER; return 0; error: - if(gpv!=NULL) + if(gpv != NULL) pkg_free(gpv); LM_ERR("error at PV geoip name: %.*s\n", in->len, in->s); return -1; } -int pv_geoip_get_strzval(struct sip_msg *msg, pv_param_t *param, - pv_value_t *res, char *sval) +int pv_geoip_get_strzval( + struct sip_msg *msg, pv_param_t *param, pv_value_t *res, char *sval) { str s; - if(sval==NULL) + if(sval == NULL) return pv_get_null(msg, param, res); s.s = sval; @@ -241,125 +242,115 @@ int pv_geoip_get_strzval(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &s); } -int pv_get_geoip(struct sip_msg *msg, pv_param_t *param, - pv_value_t *res) +int pv_get_geoip(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { geoip_pv_t *gpv; - if(msg==NULL || param==NULL) + if(msg == NULL || param == NULL) return -1; - gpv = (geoip_pv_t*)param->pvn.u.dname; - if(gpv==NULL) + gpv = (geoip_pv_t *)param->pvn.u.dname; + if(gpv == NULL) return -1; - if(gpv->item==NULL) + if(gpv->item == NULL) return pv_get_null(msg, param, res); - switch(gpv->type) - { + switch(gpv->type) { case 1: /* tz */ - if(gpv->item->r.time_zone==NULL) - { - if(gpv->item->r.flags&1) + if(gpv->item->r.time_zone == NULL) { + if(gpv->item->r.flags & 1) return pv_get_null(msg, param, res); - if(gpv->item->r.record==NULL) + if(gpv->item->r.record == NULL) return pv_get_null(msg, param, res); - gpv->item->r.time_zone - = (char*)GeoIP_time_zone_by_country_and_region( - gpv->item->r.record->country_code, - gpv->item->r.record->region); + gpv->item->r.time_zone = + (char *)GeoIP_time_zone_by_country_and_region( + gpv->item->r.record->country_code, + gpv->item->r.record->region); gpv->item->r.flags |= 1; } - return pv_geoip_get_strzval(msg, param, res, - gpv->item->r.time_zone); + return pv_geoip_get_strzval( + msg, param, res, gpv->item->r.time_zone); case 2: /* zip */ - if(gpv->item->r.record==NULL) + if(gpv->item->r.record == NULL) return pv_get_null(msg, param, res); - return pv_geoip_get_strzval(msg, param, res, - gpv->item->r.record->postal_code); + return pv_geoip_get_strzval( + msg, param, res, gpv->item->r.record->postal_code); case 3: /* lat */ - if((gpv->item->r.flags&2)==0) - { - if(gpv->item->r.record==NULL) + if((gpv->item->r.flags & 2) == 0) { + if(gpv->item->r.record == NULL) return pv_get_null(msg, param, res); snprintf(gpv->item->r.latitude, 15, "%f", gpv->item->r.record->latitude); gpv->item->r.flags |= 2; } - return pv_geoip_get_strzval(msg, param, res, - gpv->item->r.latitude); + return pv_geoip_get_strzval(msg, param, res, gpv->item->r.latitude); case 4: /* lon */ - if((gpv->item->r.flags&4)==0) - { - if(gpv->item->r.record==NULL) + if((gpv->item->r.flags & 4) == 0) { + if(gpv->item->r.record == NULL) return pv_get_null(msg, param, res); snprintf(gpv->item->r.longitude, 15, "%f", gpv->item->r.record->longitude); gpv->item->r.flags |= 4; } - return pv_geoip_get_strzval(msg, param, res, - gpv->item->r.longitude); + return pv_geoip_get_strzval( + msg, param, res, gpv->item->r.longitude); case 5: /* dma */ - if(gpv->item->r.record==NULL) + if(gpv->item->r.record == NULL) return pv_get_null(msg, param, res); - return pv_get_sintval(msg, param, res, - gpv->item->r.record->dma_code); + return pv_get_sintval( + msg, param, res, gpv->item->r.record->dma_code); case 6: /* ips */ case 7: /* ipe */ - if((gpv->item->r.flags&8)==0) - { - gpv->item->r.range = GeoIP_range_by_ip(_handle_GeoIP, - gpv->item->r.tomatch); + if((gpv->item->r.flags & 8) == 0) { + gpv->item->r.range = + GeoIP_range_by_ip(_handle_GeoIP, gpv->item->r.tomatch); gpv->item->r.flags |= 8; } - if(gpv->item->r.range==NULL) + if(gpv->item->r.range == NULL) return pv_get_null(msg, param, res); - if(gpv->type==6) - return pv_geoip_get_strzval(msg, param, res, - gpv->item->r.range[0]); - return pv_geoip_get_strzval(msg, param, res, - gpv->item->r.range[1]); + if(gpv->type == 6) + return pv_geoip_get_strzval( + msg, param, res, gpv->item->r.range[0]); + return pv_geoip_get_strzval(msg, param, res, gpv->item->r.range[1]); case 8: /* city */ - return pv_geoip_get_strzval(msg, param, res, - gpv->item->r.record->city); + return pv_geoip_get_strzval( + msg, param, res, gpv->item->r.record->city); case 9: /* area */ - if(gpv->item->r.record==NULL) + if(gpv->item->r.record == NULL) return pv_get_null(msg, param, res); - return pv_get_sintval(msg, param, res, - gpv->item->r.record->area_code); + return pv_get_sintval( + msg, param, res, gpv->item->r.record->area_code); case 10: /* regc */ - if(gpv->item->r.record==NULL) + if(gpv->item->r.record == NULL) return pv_get_null(msg, param, res); - return pv_geoip_get_strzval(msg, param, res, - gpv->item->r.record->region); + return pv_geoip_get_strzval( + msg, param, res, gpv->item->r.record->region); case 11: /* regn */ - if((gpv->item->r.flags&16)==0) - { - if(gpv->item->r.record==NULL) + if((gpv->item->r.flags & 16) == 0) { + if(gpv->item->r.record == NULL) return pv_get_null(msg, param, res); - gpv->item->r.region_name - = (char*)GeoIP_region_name_by_code( - gpv->item->r.record->country_code, - gpv->item->r.record->region); + gpv->item->r.region_name = (char *)GeoIP_region_name_by_code( + gpv->item->r.record->country_code, + gpv->item->r.record->region); gpv->item->r.flags |= 16; } - return pv_geoip_get_strzval(msg, param, res, - gpv->item->r.region_name); + return pv_geoip_get_strzval( + msg, param, res, gpv->item->r.region_name); case 12: /* metro */ - if(gpv->item->r.record==NULL) + if(gpv->item->r.record == NULL) return pv_get_null(msg, param, res); - return pv_get_sintval(msg, param, res, - gpv->item->r.record->metro_code); + return pv_get_sintval( + msg, param, res, gpv->item->r.record->metro_code); case 13: /* contc */ - if(gpv->item->r.record==NULL) + if(gpv->item->r.record == NULL) return pv_get_null(msg, param, res); - return pv_geoip_get_strzval(msg, param, res, - gpv->item->r.record->continent_code); + return pv_geoip_get_strzval( + msg, param, res, gpv->item->r.record->continent_code); default: /* cc */ - if(gpv->item->r.record==NULL) + if(gpv->item->r.record == NULL) return pv_get_null(msg, param, res); - return pv_geoip_get_strzval(msg, param, res, - gpv->item->r.record->country_code); + return pv_geoip_get_strzval( + msg, param, res, gpv->item->r.record->country_code); } } @@ -367,8 +358,7 @@ int geoip_init_pv(char *path) { _handle_GeoIP = GeoIP_open(path, GEOIP_MMAP_CACHE); - if(_handle_GeoIP==NULL) - { + if(_handle_GeoIP == NULL) { LM_ERR("cannot open GeoIP database file at: %s\n", path); return -1; } @@ -381,10 +371,9 @@ void geoip_destroy_list(void) void geoip_destroy_pv(void) { - if(_handle_GeoIP!=NULL) - { + if(_handle_GeoIP != NULL) { GeoIP_delete(_handle_GeoIP); - _handle_GeoIP=NULL; + _handle_GeoIP = NULL; } } @@ -394,11 +383,11 @@ void geoip_pv_reset(str *name) gr = sr_geoip_get_record(name); - if(gr==NULL) + if(gr == NULL) return; - if(gr->range!=NULL) + if(gr->range != NULL) GeoIP_range_by_ip_delete(gr->range); - if(gr->record!=NULL) + if(gr->record != NULL) GeoIPRecord_delete(gr->record); memset(gr, 0, sizeof(struct _sr_geoip_record)); } @@ -407,26 +396,22 @@ int geoip_update_pv(str *tomatch, str *name) { sr_geoip_record_t *gr = NULL; - if(tomatch->len>255) - { + if(tomatch->len > 255) { LM_DBG("target too long (max 255): %s\n", tomatch->s); return -3; } gr = sr_geoip_get_record(name); - if(gr==NULL) - { + if(gr == NULL) { LM_DBG("container not found: %s\n", tomatch->s); - return - 4; + return -4; } strncpy(gr->tomatch, tomatch->s, tomatch->len); gr->tomatch[tomatch->len] = '\0'; - gr->record = GeoIP_record_by_name(_handle_GeoIP, - (const char*)gr->tomatch); + gr->record = GeoIP_record_by_name(_handle_GeoIP, (const char *)gr->tomatch); LM_DBG("attempt to match: %s\n", gr->tomatch); - if (gr->record == NULL) - { + if(gr->record == NULL) { LM_DBG("no match for: %s\n", gr->tomatch); return -2; } @@ -434,4 +419,3 @@ int geoip_update_pv(str *tomatch, str *name) return 1; } - diff --git a/src/modules/geoip/geoip_pv.h b/src/modules/geoip/geoip_pv.h index 51c3312ba3a..c5cb7c0f0b2 100644 --- a/src/modules/geoip/geoip_pv.h +++ b/src/modules/geoip/geoip_pv.h @@ -30,8 +30,7 @@ #include "../../core/pvar.h" int pv_parse_geoip_name(pv_spec_p sp, str *in); -int pv_get_geoip(struct sip_msg *msg, pv_param_t *param, - pv_value_t *res); +int pv_get_geoip(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int geoip_init_pv(char *path); void geoip_destroy_pv(void); @@ -39,4 +38,3 @@ void geoip_pv_reset(str *pvclass); int geoip_update_pv(str *tomatch, str *pvclass); #endif -