sr-dev May 2015

sr-dev@lists.kamailio.org

34 participants
297 discussions

git:master:a19337d3: Makefile: use distclean as shortcut of maintainer-clean

by Victor Seva

Module: kamailio Branch: master Commit: a19337d305ba13ade7c30bfaa2926ee1d63930d9 URL: https://github.com/kamailio/kamailio/commit/a19337d305ba13ade7c30bfaa2926ee… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-05-22T14:47:05+02:00 Makefile: use distclean as shortcut of maintainer-clean Fixes: #167 Nowadays people expect distclean to be the rule to do the cleaning --- Modified: Makefile Modified: Makefile.targets --- Diff: https://github.com/kamailio/kamailio/commit/a19337d305ba13ade7c30bfaa2926ee… Patch: https://github.com/kamailio/kamailio/commit/a19337d305ba13ade7c30bfaa2926ee… --- diff --git a/Makefile b/Makefile index 31fe195..efd58cc 100644 --- a/Makefile +++ b/Makefile @@ -920,10 +920,10 @@ clean: clean-libs clean-extra-names: @rm -f $(filter-out $(MAIN_NAME), sip-router ser kamailio) -# proper/distclean a.s.o modules, utils and libs too +# proper/distclean-old a.s.o modules, utils and libs too proper: clean-extra-names proper-modules proper-utils proper-libs -distclean: distclean-modules distclean-utils distclean-libs +distclean-old: distclean-modules distclean-utils distclean-libs realclean: realclean-modules realclean-utils realclean-libs maintainer-clean: maintainer-clean-modules maintainer-clean-utils \ maintainer-clean-libs @@ -936,7 +936,7 @@ clean-all: clean maintainer-clean: modules=$(modules_all) # on make proper clean also the build config (w/o module list) -proper realclean distclean maintainer-clean: clean_cfg +proper realclean distclean-old maintainer-clean: clean_cfg # on maintainer clean, remove also the configured module list maintainer-clean: clean_modules_cfg clean_makefile_vars @@ -959,7 +959,7 @@ clean_modules_cfg clean-modules-cfg: # clean everything generated - shortcut on maintainer-clean .PHONY: pure -pure: maintainer-clean +pure distclean: maintainer-clean .PHONY: install_initd_debian install-initd-debian install_initd_debian install-initd-debian: diff --git a/Makefile.targets b/Makefile.targets index 93399c8..9f9bf66 100644 --- a/Makefile.targets +++ b/Makefile.targets @@ -10,7 +10,7 @@ ifeq (,$(strip $(modules_dirs))) include $(COREPATH)/Makefile.dirs endif -clean_targets:= clean proper distclean realclean maintainer-clean local-clean \ +clean_targets:= clean proper distclean-old realclean maintainer-clean local-clean \ clean-all proper-all distclean-all realclean-all \ clean_cfg clean-cfg clean_modules_cfg clean-modules-cfg \ clean-modules proper-modules realclean-modules \ @@ -19,7 +19,8 @@ clean_targets:= clean proper distclean realclean maintainer-clean local-clean \ maintaner-clean-utils \ clean-libs proper-libs realclean-libs distclean-libs \ maintainer-clean-libs \ - clean-tmp clean_doxygen clean-extra-names + clean-tmp clean_doxygen clean-extra-names \ + pure distclean doc_targets:= README man install-doc install-man install-ser-man \ install-every-module-doc install-every-module-man \ $(foreach m,$(modules_dirs),$(m)-doc $(m)-readme $(m)-man) \

9 years, 7 months

[kamailio] Makefile: use distclean as shortcut of maintainer-clean (#170)

by Victor Seva

Fixes: #167 Nowadays people expect distclean to be the rule to do the cleaning You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/170 -- Commit Summary -- * Makefile: use distclean as shortcut of maintainer-clean -- File Changes -- M Makefile (8) M Makefile.targets (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/170.patch https://github.com/kamailio/kamailio/pull/170.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/170

9 years, 7 months

[kamailio] Failed to parse mysql connection uri, when '@' operator is added in password section (#169)

by DEBOJIT KAKOTI

I have added DBURL as #!define DBURL "mysql://kamailio_test:kam@#sip@localhost/kamailio" Where username is kamailio_test and password is kam@#sip So after the first '@' operator it is assuming it as host part which is not true in this case. Error log: 'ERROR: db_mysql [km_my_con.c:114]: db_mysql_new_connection(): driver error: Unknown MySQL server host '#sip@localhost' (2)' --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/169

9 years, 7 months

Re: [sr-dev] [kamailio] Makefile: use distclean as shortcut of maintainer-clean (cfa04ea)

by Victor Seva

I just followed the logic: no pure, no distclean there. As pure and distclean are just calling maintainer-clean and that is there I thought it was OK --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/cfa04ea34f1888c9e2206808d9ca0b6…

9 years, 7 months

Re: [sr-dev] [kamailio] Makefile: use distclean as shortcut of maintainer-clean (cfa04ea)

by Daniel-Constantin Mierla

The new distclean is no longer needed in clean_targets? I see maintainer-clean is there. On the other hand 'pure' is missing, but that was added by me a while ago to be easy to remember. Otherwise, it can be committed. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/cfa04ea34f1888c9e2206808d9ca0b6…

9 years, 7 months

git:master:c02e165c: lib/srdb1: use last @ as delimiter for start of host in db url

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c02e165cc7a44e525dd55714c4471f1236e96b43 URL: https://github.com/kamailio/kamailio/commit/c02e165cc7a44e525dd55714c4471f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-22T12:43:55+02:00 lib/srdb1: use last @ as delimiter for start of host in db url - allow @ to be part of password - reported by GH#169, Debojit Kakoti --- Modified: lib/srdb1/db_id.c --- Diff: https://github.com/kamailio/kamailio/commit/c02e165cc7a44e525dd55714c4471f1… Patch: https://github.com/kamailio/kamailio/commit/c02e165cc7a44e525dd55714c4471f1… --- diff --git a/lib/srdb1/db_id.c b/lib/srdb1/db_id.c index aab3054..f1969c1 100644 --- a/lib/srdb1/db_id.c +++ b/lib/srdb1/db_id.c @@ -81,7 +81,7 @@ static int parse_db_url(struct db_id* id, const str* url) }; enum state st; - unsigned int len, i; + unsigned int len, i, j, a; const char* begin; char* prev_token; @@ -162,6 +162,14 @@ static int parse_db_url(struct db_id* id, const str* url) st = ST_HOST; id->username = prev_token; prev_token = 0; + a = 0; + /* go to last '@' to support when it is part of password */ + for(j = i+1; j < len; j++) { + if(url->s[j]=='@') { + a = j; + } + } + if(a!=0) i = a; if (dupl_string(&id->password, begin, url->s + i) < 0) goto err; begin = url->s + i + 1; break;

9 years, 7 months

git:master:46cc69f2: Merge pull request #168 from kamailio/vseva/gcc_warnings

by Victor Seva

Module: kamailio Branch: master Commit: 46cc69f229e5e005cca60f64ec6c40c910e2043b URL: https://github.com/kamailio/kamailio/commit/46cc69f229e5e005cca60f64ec6c40c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-05-22T11:15:46+02:00 Merge pull request #168 from kamailio/vseva/gcc_warnings clean some gcc warnings --- 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 Modified: modules/db_perlvdb/perlvdb_conv.c Modified: modules/db_postgres/pg_cmd.c Modified: modules/db_text/dbt_raw_util.c Modified: modules/ims_isc/mark.c Modified: modules/pua_reginfo/usrloc_cb.c Modified: modules/purple/hashtable.c Modified: modules/purple/purple_sip.c 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/46cc69f229e5e005cca60f64ec6c40c… Patch: https://github.com/kamailio/kamailio/commit/46cc69f229e5e005cca60f64ec6c40c…

9 years, 7 months

git:master:e15d4153: purple: clean gcc warnings

by Victor Seva

Module: kamailio Branch: master Commit: e15d415323b44a93acd2d811fa3609af141e814e URL: https://github.com/kamailio/kamailio/commit/e15d415323b44a93acd2d811fa3609a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-05-21T23:33:39+02:00 purple: clean gcc warnings hashtable.c:39:3: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] hashtable.c:39:3: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] hashtable.c:39:3: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] hashtable.c:39:3: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] hashtable.c:43:2: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] hashtable.c:43:2: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] hashtable.c:43:2: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] hashtable.c:43:2: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] purple_sip.c:77:36: warning: variable âcipid_nsâ set but not used [-Wunused-but-set-variable] --- Modified: modules/purple/hashtable.c Modified: modules/purple/purple_sip.c --- Diff: https://github.com/kamailio/kamailio/commit/e15d415323b44a93acd2d811fa3609a… Patch: https://github.com/kamailio/kamailio/commit/e15d415323b44a93acd2d811fa3609a… --- diff --git a/modules/purple/hashtable.c b/modules/purple/hashtable.c index 1c5d02a..5d6159d 100644 --- a/modules/purple/hashtable.c +++ b/modules/purple/hashtable.c @@ -36,11 +36,11 @@ static int *get_counter(char *key) { if (d == NULL) { gchar *k = g_strdup(key); d = (int*) pkg_malloc(sizeof(int)); - LM_DBG("counter created @0x%08x\n", (unsigned int)d); + LM_DBG("counter created @0x%p\n", d); *d = 0; g_hash_table_insert(hash, k, d); } - LM_DBG("counter@0x%08x: key: %s ; value: %d\n", (unsigned int)d, key, *d); + LM_DBG("counter@0x%p: key: %s ; value: %d\n", d, key, *d); return d; } diff --git a/modules/purple/purple_sip.c b/modules/purple/purple_sip.c index 4f5f2c2..88f95dd 100644 --- a/modules/purple/purple_sip.c +++ b/modules/purple/purple_sip.c @@ -74,7 +74,7 @@ static str* build_pidf(char *uri, char *id, enum purple_publish_basic basic, enu xmlNodePtr root_node = NULL, status_node = NULL; xmlNodePtr tuple_node = NULL, basic_node = NULL; xmlNodePtr person_node = NULL, activities_node = NULL; - xmlNsPtr pidf_ns, dm_ns, rpid_ns, cipid_ns; + xmlNsPtr pidf_ns, dm_ns, rpid_ns; char* entity = NULL; entity = (char*)pkg_malloc(7+ strlen(uri)*sizeof(char)); @@ -104,7 +104,7 @@ static str* build_pidf(char *uri, char *id, enum purple_publish_basic basic, enu pidf_ns = xmlNewNs(root_node, BAD_CAST "urn:ietf:params:xml:ns:pidf", NULL); dm_ns = xmlNewNs(root_node, BAD_CAST "urn:ietf:params:xml:ns:pidf:data-model", BAD_CAST "dm"); rpid_ns = xmlNewNs(root_node, BAD_CAST "urn:ietf:params:xml:ns:pidf:rpid", BAD_CAST "rpid"); - cipid_ns = xmlNewNs(root_node, BAD_CAST "urn:ietf:params:xml:ns:pidf:cipid", BAD_CAST "c"); + xmlNewNs(root_node, BAD_CAST "urn:ietf:params:xml:ns:pidf:cipid", BAD_CAST "c"); tuple_node = xmlNewChild(root_node, NULL, BAD_CAST "tuple", NULL); if( tuple_node == NULL) {

9 years, 7 months

git:master:a52859a6: ims_isc: clean gcc warnings

by Victor Seva

Module: kamailio Branch: master Commit: a52859a6ed8c1ea2590e51e0c20d1f2553da1ec9 URL: https://github.com/kamailio/kamailio/commit/a52859a6ed8c1ea2590e51e0c20d1f2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-05-21T23:21:25+02:00 ims_isc: clean gcc warnings mark.c:341:9: warning: format â%zuâ expects argument of type âsize_tâ, but argument 10 has type âintâ [-Wformat] mark.c:341:9: warning: format â%zuâ expects argument of type âsize_tâ, but argument 8 has type âintâ [-Wformat] mark.c:341:1: warning: format â%zuâ expects argument of type âsize_tâ, but argument 8 has type âintâ [-Wformat] mark.c:341:1: warning: format â%zuâ expects argument of type âsize_tâ, but argument 6 has type âintâ [-Wformat] mark.c:350:9: warning: format â%zuâ expects argument of type âsize_tâ, but argument 10 has type âintâ [-Wformat] mark.c:350:9: warning: format â%zuâ expects argument of type âsize_tâ, but argument 8 has type âintâ [-Wformat] mark.c:350:1: warning: format â%zuâ expects argument of type âsize_tâ, but argument 8 has type âintâ [-Wformat] mark.c:350:1: warning: format â%zuâ expects argument of type âsize_tâ, but argument 6 has type âintâ [-Wformat] mark.c:357:9: warning: format â%zuâ expects argument of type âsize_tâ, but argument 13 has type âintâ [-Wformat] mark.c:357:9: warning: format â%zuâ expects argument of type âsize_tâ, but argument 11 has type âintâ [-Wformat] mark.c:357:1: warning: format â%zuâ expects argument of type âsize_tâ, but argument 11 has type âintâ [-Wformat] mark.c:357:1: warning: format â%zuâ expects argument of type âsize_tâ, but argument 9 has type âintâ [-Wformat] --- Modified: modules/ims_isc/mark.c --- Diff: https://github.com/kamailio/kamailio/commit/a52859a6ed8c1ea2590e51e0c20d1f2… Patch: https://github.com/kamailio/kamailio/commit/a52859a6ed8c1ea2590e51e0c20d1f2… --- diff --git a/modules/ims_isc/mark.c b/modules/ims_isc/mark.c index 99ef7de..167f3af 100644 --- a/modules/ims_isc/mark.c +++ b/modules/ims_isc/mark.c @@ -313,7 +313,7 @@ inline int isc_mark_write_route(struct sip_msg *msg, str *as, str *iscmark) { */ int isc_mark_write_psu(struct sip_msg *msg, isc_mark *mark) { struct lump *l = msg->add_rm; - int hlen; + size_t hlen; char * hstr = NULL; const str *regstate, *sescase;

9 years, 7 months

git:master:c051cb8d: snmpstats: clean gcc warnings

by Victor Seva

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)

9 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2015