sr-dev May 2015

sr-dev@lists.kamailio.org

34 participants
298 discussions

git:master:c051cb8d: snmpstats: clean gcc warnings
by Victor Seva 22 May '15

22 May '15

Module: kamailio Branch: master Commit: c051cb8da9759676395603af1bfb4f1f26f9d2f6 URL: https://github.com/kamailio/kamailio/commit/c051cb8da9759676395603af1bfb4f1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-05-21T23:16:09+02:00 snmpstats: clean gcc warnings hashTable.c:168:22: warning: variable âpreviousRecordâ set but not used [-Wunused-but-set-variable] kamailioNet.c:973:18: warning: variable âvalueâ set but not used [-Wunused-but-set-variable] snmpSIPRegUserLookupTable.c:462:25: warning: variable âvarâ set but not used [-Wunused-but-set-variable] snmpSIPStatusCodesTable.c:493:30: warning: variable âvarâ set but not used [-Wunused-but-set-variable] --- Modified: modules/snmpstats/hashTable.c Modified: modules/snmpstats/kamailioNet.c Modified: modules/snmpstats/snmpSIPRegUserLookupTable.c Modified: modules/snmpstats/snmpSIPStatusCodesTable.c --- Diff: https://github.com/kamailio/kamailio/commit/c051cb8da9759676395603af1bfb4f1… Patch: https://github.com/kamailio/kamailio/commit/c051cb8da9759676395603af1bfb4f1… --- diff --git a/modules/snmpstats/hashTable.c b/modules/snmpstats/hashTable.c index 1b391ca..69caf34 100644 --- a/modules/snmpstats/hashTable.c +++ b/modules/snmpstats/hashTable.c @@ -165,7 +165,6 @@ void deleteUser(hashSlot_t *theTable, char *aor, int hashTableSize) int hashIndex = calculateHashSlot(aor, hashTableSize); int searchStringLength = strlen(aor); - aorToIndexStruct_t *previousRecord = theTable[hashIndex].first; aorToIndexStruct_t *currentRecord = theTable[hashIndex].first; while (currentRecord != NULL) { @@ -227,7 +226,6 @@ void deleteUser(hashSlot_t *theTable, char *aor, int hashTableSize) } /* Advance to the next records. */ - previousRecord = currentRecord; currentRecord = currentRecord->next; } diff --git a/modules/snmpstats/kamailioNet.c b/modules/snmpstats/kamailioNet.c index 9269e52..3c2097b 100644 --- a/modules/snmpstats/kamailioNet.c +++ b/modules/snmpstats/kamailioNet.c @@ -977,11 +977,6 @@ handle_kamailioNetTcpKeepIdle(netsnmp_mib_handler *handler, switch(reqinfo->mode) { - struct cfg_group_tcp t; - unsigned int value; - - tcp_options_get(&t); - value = t.con_lifetime; case MODE_GET: snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER, (u_char *) &value, sizeof(int)); diff --git a/modules/snmpstats/snmpSIPRegUserLookupTable.c b/modules/snmpstats/snmpSIPRegUserLookupTable.c index fb70929..1f0281d 100644 --- a/modules/snmpstats/snmpSIPRegUserLookupTable.c +++ b/modules/snmpstats/snmpSIPRegUserLookupTable.c @@ -459,15 +459,12 @@ void kamailioSIPRegUserLookupTable_set_reserve2( netsnmp_request_group *rg ) netsnmp_request_group_item *current; - netsnmp_variable_list *var; - int rc; rg->rg_void = rg->list->ri; for( current = rg->list; current; current = current->next ) { - var = current->ri->requestvb; rc = SNMP_ERR_NOERROR; switch(current->tri->colnum) diff --git a/modules/snmpstats/snmpSIPStatusCodesTable.c b/modules/snmpstats/snmpSIPStatusCodesTable.c index ad7c600..0ff74ad 100644 --- a/modules/snmpstats/snmpSIPStatusCodesTable.c +++ b/modules/snmpstats/snmpSIPStatusCodesTable.c @@ -490,7 +490,6 @@ void kamailioSIPStatusCodesTable_set_reserve2( netsnmp_request_group *rg ) (kamailioSIPStatusCodesTable_context *)rg->undo_info; netsnmp_request_group_item *current; - netsnmp_variable_list *var; int rc; @@ -498,7 +497,6 @@ void kamailioSIPStatusCodesTable_set_reserve2( netsnmp_request_group *rg ) for( current = rg->list; current; current = current->next ) { - var = current->ri->requestvb; rc = SNMP_ERR_NOERROR; switch(current->tri->colnum)

1 0

git:master:1874dd10: db_perlvdb: clean gcc warning
by Victor Seva 22 May '15

22 May '15

Module: kamailio Branch: master Commit: 1874dd1062fbc186316ddc91ae87a22b18d16951 URL: https://github.com/kamailio/kamailio/commit/1874dd1062fbc186316ddc91ae87a22… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-05-21T22:45:05+02:00 db_perlvdb: clean gcc warning perlvdb_conv.c:99:2: warning: enumeration value âDB1_UNKNOWNâ not handled in switch [-Wswitch] --- Modified: modules/db_perlvdb/perlvdb_conv.c --- Diff: https://github.com/kamailio/kamailio/commit/1874dd1062fbc186316ddc91ae87a22… Patch: https://github.com/kamailio/kamailio/commit/1874dd1062fbc186316ddc91ae87a22… --- diff --git a/modules/db_perlvdb/perlvdb_conv.c b/modules/db_perlvdb/perlvdb_conv.c index d019006..5a0c7c0 100644 --- a/modules/db_perlvdb/perlvdb_conv.c +++ b/modules/db_perlvdb/perlvdb_conv.c @@ -140,6 +140,9 @@ inline SV *valdata(db_val_t* val) { case DB1_BITMAP: data = newSViv(VAL_BITMAP(val)); break; + + default: + break; } return data;

1 0

git:master:21f43784: db_berkeley: clean gcc warnings
by Victor Seva 22 May '15

22 May '15

Module: kamailio Branch: master Commit: 21f437840123471daa65da65999ff108ad11b33b URL: https://github.com/kamailio/kamailio/commit/21f437840123471daa65da65999ff10… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-05-21T22:08:25+02:00 db_berkeley: clean gcc warnings pg_cmd.c:183:17: warning: variable âpcmdâ set but not used [-Wunused-but-set-variable] pg_cmd.c:372:17: warning: variable âpcmdâ set but not used [-Wunused-but-set-variable] pg_cmd.c:396:17: warning: variable âpcmdâ set but not used [-Wunused-but-set-variable] bdb_cmd.c:512:13: warning: variable âbconâ set but not used [-Wunused-but-set-variable] bdb_cmd.c:511:13: warning: variable âbresâ set but not used [-Wunused-but-set-variable] bdb_con.c:52:13: warning: variable âburiâ set but not used [-Wunused-but-set-variable] km_bdb_res.c:405:2: warning: enumeration value âDB1_UNKNOWNâ not handled in switch [-Wswitch] km_bdb_res.c:498:2: warning: enumeration value âDB1_UNKNOWNâ not handled in switch [-Wswitch] km_bdb_val.c:105:2: warning: enumeration value âDB1_UNKNOWNâ not handled in switch [-Wswitch] km_db_berkeley.c:779:6: warning: variable âiâ set but not used [-Wunused-but-set-variable] km_db_berkeley.c:907:6: warning: variable âiâ set but not used [-Wunused-but-set-variable] --- Modified: modules/db_berkeley/bdb_cmd.c Modified: modules/db_berkeley/bdb_con.c Modified: modules/db_berkeley/km_bdb_res.c Modified: modules/db_berkeley/km_bdb_val.c Modified: modules/db_berkeley/km_db_berkeley.c --- Diff: https://github.com/kamailio/kamailio/commit/21f437840123471daa65da65999ff10… Patch: https://github.com/kamailio/kamailio/commit/21f437840123471daa65da65999ff10… --- diff --git a/modules/db_berkeley/bdb_cmd.c b/modules/db_berkeley/bdb_cmd.c index a53d5e9..682d4e3 100644 --- a/modules/db_berkeley/bdb_cmd.c +++ b/modules/db_berkeley/bdb_cmd.c @@ -507,17 +507,11 @@ int bdb_cmd_first(db_res_t* res) int bdb_cmd_next(db_res_t* res) { - db_con_t *con; - bdb_res_t *bres; - bdb_con_t *bcon; bdb_cmd_t *bcmd; DBT key, data; int ret; static char dbuf[MAX_ROW_SIZE]; - con = res->cmd->ctx->con[db_payload_idx]; - bres = DB_GET_PAYLOAD(res); - bcon = DB_GET_PAYLOAD(con); bcmd = DB_GET_PAYLOAD(res->cmd); if (bcmd->next_flag == 2 || bcmd->next_flag == -2) return 1; diff --git a/modules/db_berkeley/bdb_con.c b/modules/db_berkeley/bdb_con.c index 4e410d6..73b94c6 100644 --- a/modules/db_berkeley/bdb_con.c +++ b/modules/db_berkeley/bdb_con.c @@ -49,12 +49,9 @@ */ static void bdb_con_free(db_con_t* con, bdb_con_t *payload) { - bdb_uri_t *buri; if (!payload) return; - buri = DB_GET_PAYLOAD(con->uri); - /* Delete the structure only if there are no more references * to it in the connection pool */ diff --git a/modules/db_berkeley/km_bdb_res.c b/modules/db_berkeley/km_bdb_res.c index 3d46483..44b945a 100644 --- a/modules/db_berkeley/km_bdb_res.c +++ b/modules/db_berkeley/km_bdb_res.c @@ -429,6 +429,8 @@ int bdb_is_neq_type(db_type_t _t0, db_type_t _t1) case DB1_BITMAP: if (_t0==DB1_INT) return 0; + default: + break; } return 1; } @@ -545,6 +547,8 @@ int bdb_cmp_val(db_val_t* _vp, db_val_t* _v) case DB1_BITMAP: return (_vp->val.int_val<_v->val.bitmap_val)?-1: (_vp->val.int_val>_v->val.bitmap_val)?1:0; + default: + break; } return -2; } diff --git a/modules/db_berkeley/km_bdb_val.c b/modules/db_berkeley/km_bdb_val.c index f77946d..15de46f 100644 --- a/modules/db_berkeley/km_bdb_val.c +++ b/modules/db_berkeley/km_bdb_val.c @@ -173,6 +173,8 @@ int bdb_str2val(db_type_t _t, db_val_t* _v, char* _s, int _l) VAL_TYPE(_v) = DB1_BLOB; LM_DBG("got blob len %d\n", _l); return 0; + default: + break; } return -6; diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index 4936bed..9b0806e 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -776,13 +776,13 @@ int bdb_delete(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, int _n) tbl_cache_p _tbc = NULL; table_p _tp = NULL; char kbuf[MAX_ROW_SIZE]; - int i, j, ret, klen; + int ret, klen; int *lkey=NULL; DBT key; DB *db; DBC *dbcp; - i = j = ret = 0; + ret = 0; klen=MAX_ROW_SIZE; if (_op) @@ -904,13 +904,13 @@ int _bdb_delete_cursor(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, db1_res_t* _r = NULL; char kbuf[MAX_ROW_SIZE]; char dbuf[MAX_ROW_SIZE]; - int i, ret, klen=MAX_ROW_SIZE; + int ret, klen=MAX_ROW_SIZE; DBT key, data; DB *db; DBC *dbcp; int *lkey=NULL; - i = ret = 0; + ret = 0; if ((!_h) || !CON_TABLE(_h)) return -1;

1 0

git:master:0a1bb3f0: pua_reginfo: clean gcc warnings
by Victor Seva 22 May '15

22 May '15

Module: kamailio Branch: master Commit: 0a1bb3f044ccf5dbb79eb03caec19553166c228e URL: https://github.com/kamailio/kamailio/commit/0a1bb3f044ccf5dbb79eb03caec1955… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-05-21T22:16:21+02:00 pua_reginfo: clean gcc warnings usrloc_cb.c:68:6: warning: variable âbuf_lenâ set but not used [-Wunused-but-set-variable] --- Modified: modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/0a1bb3f044ccf5dbb79eb03caec1955… Patch: https://github.com/kamailio/kamailio/commit/0a1bb3f044ccf5dbb79eb03caec1955…

1 0

git:master:70ad498b: db_postgres: remove gcc warnings
by Victor Seva 22 May '15

22 May '15

Module: kamailio Branch: master Commit: 70ad498b2ccc41db77b14c4c79393548cac8426d URL: https://github.com/kamailio/kamailio/commit/70ad498b2ccc41db77b14c4c7939354… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-05-21T21:56:50+02:00 db_postgres: remove gcc warnings pg_cmd.c:183:17: warning: variable âpcmdâ set but not used [-Wunused-but-set-variable] pg_cmd.c:372:17: warning: variable âpcmdâ set but not used [-Wunused-but-set-variable] pg_cmd.c:396:17: warning: variable âpcmdâ set but not used [-Wunused-but-set-variable] --- Modified: modules/db_postgres/pg_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/70ad498b2ccc41db77b14c4c7939354… Patch: https://github.com/kamailio/kamailio/commit/70ad498b2ccc41db77b14c4c7939354… --- diff --git a/modules/db_postgres/pg_cmd.c b/modules/db_postgres/pg_cmd.c index db7ad66..7267cd3 100644 --- a/modules/db_postgres/pg_cmd.c +++ b/modules/db_postgres/pg_cmd.c @@ -180,10 +180,8 @@ static void free_pg_params(struct pg_params* params) */ static int check_types(db_cmd_t* cmd) { - struct pg_cmd* pcmd; struct pg_con* pcon; - pcmd = DB_GET_PAYLOAD(cmd); /* FIXME: The function should take the connection as one of parameters */ pcon = DB_GET_PAYLOAD(cmd->ctx->con[db_payload_idx]); @@ -369,11 +367,8 @@ int pg_cmd(db_cmd_t* cmd) int pg_getopt(db_cmd_t* cmd, char* optname, va_list ap) { - struct pg_cmd* pcmd; long long* id; - pcmd = (struct pg_cmd*)DB_GET_PAYLOAD(cmd); - if (!strcasecmp("last_id", optname)) { id = va_arg(ap, long long*); if (id == NULL) { @@ -393,9 +388,6 @@ int pg_getopt(db_cmd_t* cmd, char* optname, va_list ap) int pg_setopt(db_cmd_t* cmd, char* optname, va_list ap) { - struct pg_cmd* pcmd; - - pcmd = (struct pg_cmd*)DB_GET_PAYLOAD(cmd); return 1; }

1 0

git:master:7b6aba34: db_text: clean gcc warning
by Victor Seva 22 May '15

22 May '15

Module: kamailio Branch: master Commit: 7b6aba346a8529187762c25f00609ec376fb3529 URL: https://github.com/kamailio/kamailio/commit/7b6aba346a8529187762c25f00609ec… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-05-21T21:24:39+02:00 db_text: clean gcc warning dbt_raw_util.c:169:6: warning: unused variable ânâ [-Wunused-variable] --- Modified: modules/db_text/dbt_raw_util.c --- Diff: https://github.com/kamailio/kamailio/commit/7b6aba346a8529187762c25f00609ec… Patch: https://github.com/kamailio/kamailio/commit/7b6aba346a8529187762c25f00609ec… --- diff --git a/modules/db_text/dbt_raw_util.c b/modules/db_text/dbt_raw_util.c index 708a6bc..a35bacb 100644 --- a/modules/db_text/dbt_raw_util.c +++ b/modules/db_text/dbt_raw_util.c @@ -166,7 +166,7 @@ int dbt_build_where(char* where, db_key_t** _k, db_op_t** _o, db_val_t** _v) char** _o1 = NULL; db_val_t* _v1 = NULL; regmatch_t* matches = NULL; - int n, l; + int l; int len; regex_t preg; int offset = 0; @@ -233,11 +233,11 @@ int dbt_build_where(char* where, db_key_t** _k, db_op_t** _o, db_val_t** _v) _v1[idx].val.str_val.s = pkg_malloc(l+1); strncpy(_v1[idx].val.str_val.s, buffer+matches[5].rm_so, l); } - -// for(n=0; n < MAX_MATCH; n++) { -// LM_ERR("MATCH RESULT %d - %d,%d\n", n, matches[n].rm_so, matches[n].rm_eo); -// } - +/* int n; + for(n=0; n < MAX_MATCH; n++) { + LM_ERR("MATCH RESULT %d - %d,%d\n", n, matches[n].rm_so, matches[n].rm_eo); + } +*/ if(matches[0].rm_eo != -1) offset += matches[0].rm_eo;

1 0

[kamailio] clean some gcc warnings (#168)
by Victor Seva 22 May '15

22 May '15

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/168 -- Commit Summary -- * db_text: clean gcc warning * db_postgres: remove gcc warnings * db_berkeley: clean gcc warnings * pua_reginfo: clean gcc warnings * db_perlvdb: clean gcc warning * snmpstats: clean gcc warnings -- File Changes -- M modules/db_berkeley/bdb_cmd.c (6) M modules/db_berkeley/bdb_con.c (3) M modules/db_berkeley/km_bdb_res.c (4) M modules/db_berkeley/km_bdb_val.c (2) M modules/db_berkeley/km_db_berkeley.c (8) M modules/db_perlvdb/perlvdb_conv.c (3) M modules/db_postgres/pg_cmd.c (8) M modules/db_text/dbt_raw_util.c (12) M modules/pua_reginfo/usrloc_cb.c (23) M modules/snmpstats/hashTable.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/168.patch https://github.com/kamailio/kamailio/pull/168.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/168

2 2

git:master:f9be1bd7: erlang: Merge fix error messages
by Seudin Kasumovic 22 May '15

22 May '15

Module: kamailio Branch: master Commit: f9be1bd71323244af598a54380d941722b60b40c URL: https://github.com/kamailio/kamailio/commit/f9be1bd71323244af598a54380d9417… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2015-05-22T11:13:31+02:00 erlang: Merge fix error messages --- Modified: modules/erlang/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/f9be1bd71323244af598a54380d9417… Patch: https://github.com/kamailio/kamailio/commit/f9be1bd71323244af598a54380d9417… --- diff --git a/modules/erlang/worker.c b/modules/erlang/worker.c index 772dfda..b0fc38a 100644 --- a/modules/erlang/worker.c +++ b/modules/erlang/worker.c @@ -334,15 +334,15 @@ int worker_reg_send_impl(ei_cnode *ec, int s,int wpid) { if (erl_errno) { - LM_ERR("ei_rpc failed on node=<%s> socket=<%d>: %s\n",enode->conn.nodename,enode->sockfd,strerror(erl_errno)); + LM_ERR("ei_reg_send failed on node=<%s> socket=<%d>: %s\n",enode->conn.nodename,enode->sockfd,strerror(erl_errno)); } else if (errno) { - LM_ERR("ei_rpc failed on node=<%s> socket=<%d>: %s\n",enode->conn.nodename,enode->sockfd,strerror(errno)); + LM_ERR("ei_reg_send failed on node=<%s> socket=<%d>: %s\n",enode->conn.nodename,enode->sockfd,strerror(errno)); } else { - LM_ERR("ei_rpc failed on node=<%s> socket=<%d>, Unknown error.\n",ec->thisalivename,enode->sockfd); + LM_ERR("ei_reg_send failed on node=<%s> socket=<%d>, Unknown error.\n",ec->thisalivename,enode->sockfd); } }

1 0

git:master:77382a7f: erlang: Fix error messages
by Seudin Kasumovic 22 May '15

22 May '15

Module: kamailio Branch: master Commit: 77382a7ff2ee3144991b013e5cabd535028e3e1e URL: https://github.com/kamailio/kamailio/commit/77382a7ff2ee3144991b013e5cabd53… Author: Seudin Kasumovic <seudin(a)bicomsystems.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2015-05-22T11:09:56+02:00 erlang: Fix error messages Fix wrong function name in error messages. --- Modified: modules/erlang/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/77382a7ff2ee3144991b013e5cabd53… Patch: https://github.com/kamailio/kamailio/commit/77382a7ff2ee3144991b013e5cabd53… --- diff --git a/modules/erlang/worker.c b/modules/erlang/worker.c index 772dfda..b0fc38a 100644 --- a/modules/erlang/worker.c +++ b/modules/erlang/worker.c @@ -334,15 +334,15 @@ int worker_reg_send_impl(ei_cnode *ec, int s,int wpid) { if (erl_errno) { - LM_ERR("ei_rpc failed on node=<%s> socket=<%d>: %s\n",enode->conn.nodename,enode->sockfd,strerror(erl_errno)); + LM_ERR("ei_reg_send failed on node=<%s> socket=<%d>: %s\n",enode->conn.nodename,enode->sockfd,strerror(erl_errno)); } else if (errno) { - LM_ERR("ei_rpc failed on node=<%s> socket=<%d>: %s\n",enode->conn.nodename,enode->sockfd,strerror(errno)); + LM_ERR("ei_reg_send failed on node=<%s> socket=<%d>: %s\n",enode->conn.nodename,enode->sockfd,strerror(errno)); } else { - LM_ERR("ei_rpc failed on node=<%s> socket=<%d>, Unknown error.\n",ec->thisalivename,enode->sockfd); + LM_ERR("ei_reg_send failed on node=<%s> socket=<%d>, Unknown error.\n",ec->thisalivename,enode->sockfd); } }

1 0

Re: [sr-dev] [kamailio] dialplan: using $(avp("key")[*]) on match/subst rules (#5)
by Victor Seva 21 May '15

21 May '15

Closed #5. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/5#event-311066656

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2015