- sr-dev - kamailio.org

git:5.4:34ee120a: pv: more details in err log message for s.select parsing
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: 34ee120ab555b9aab364af4570033c3a08451fda URL: https://github.com/kamailio/kamailio/commit/34ee120ab555b9aab364af4570033c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:10:28+02:00 pv: more details in err log message for s.select parsing (cherry picked from commit 02ad9e1b87f89b9456d0d85e16c2fe0cda67ab64) (cherry picked from commit 2273d7d856b5c1fca1ec24fbb6ee249793ea6719) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/34ee120ab555b9aab364af4570033c3… Patch: https://github.com/kamailio/kamailio/commit/34ee120ab555b9aab364af4570033c3… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 0ce73c4542..2f5c2cd48d 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2532,8 +2532,8 @@ char* tr_parse_string(str* in, trans_t *t) while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; if(*p!=TR_RBRACKET) { - LM_ERR("invalid select transformation: %.*s!!\n", - in->len, in->s); + LM_ERR("invalid select transformation: %.*s (c:%c/%d - p:%d)!!\n", + in->len, in->s, *p, *p, (int)(p - in->s)); goto error; } goto done;

1 0

git:5.4:2c501f4d: snmpstats: Fix typo in MIB
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: 2c501f4d7b9678f0cfad3afec5e3095fd61e1763 URL: https://github.com/kamailio/kamailio/commit/2c501f4d7b9678f0cfad3afec5e3095… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:10:43+02:00 snmpstats: Fix typo in MIB Reported by arkadiam on Github (cherry picked from commit 7f017707c91659641ce9ca87ee4149b2e39379f7) (cherry picked from commit dbd8e3899335eb8795763fd52b1f91aebfad1c92) --- Modified: src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB --- Diff: https://github.com/kamailio/kamailio/commit/2c501f4d7b9678f0cfad3afec5e3095… Patch: https://github.com/kamailio/kamailio/commit/2c501f4d7b9678f0cfad3afec5e3095… --- diff --git a/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB b/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB index 3351a9e424..2aaddf01ca 100644 --- a/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB +++ b/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB @@ -562,7 +562,7 @@ KAMAILIO-SIP-SERVER-MIB DEFINITIONS ::= BEGIN set the row-status to createAndGo. Then the client can do an SNMP GET on this table with the - aquired index. If the row-status is 'active', then the + acquired index. If the row-status is 'active', then the kamailioSIPRegUserIndex is the index into the kamailioSIPRegUserTable that has the specified URI (0 zero indicates no such URI). The client should then set the

1 0

git:5.4:00d71875: mtree: Fix some typos, adjust some formatting
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: 00d7187532b87507367b00110f22bd8e0e14db7c URL: https://github.com/kamailio/kamailio/commit/00d7187532b87507367b00110f22bd8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:11:43+02:00 mtree: Fix some typos, adjust some formatting (cherry picked from commit 316c80607243387015e35ac423238c5a32401a44) (cherry picked from commit 3bfb1773c01731177824b907180a7eeb7e43d3af) --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/00d7187532b87507367b00110f22bd8… Patch: https://github.com/kamailio/kamailio/commit/00d7187532b87507367b00110f22bd8… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index badbd09dc8..c04f031cfd 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -175,37 +175,37 @@ static int mod_init(void) return -1; } - if(pv_parse_spec(&value_param, &pv_value)<00 + if(pv_parse_spec(&value_param, &pv_value) < 0 || !(pv_is_w(&pv_value))) { - LM_ERR("cannot parse value pv or is read only\n"); + LM_ERR("cannot parse value pv or pv is read-only\n"); return -1; } - if (pv_parse_spec(&values_param, &pv_values) <0 + if (pv_parse_spec(&values_param, &pv_values) < 0 || pv_values.type != PVT_AVP) { LM_ERR("cannot parse values avp\n"); return -1; } - if(pv_parse_spec(&dstid_param, &pv_dstid)<0 + if(pv_parse_spec(&dstid_param, &pv_dstid) < 0 || pv_dstid.type!=PVT_AVP) { LM_ERR("cannot parse dstid avp\n"); return -1; } - if(pv_parse_spec(&weight_param, &pv_weight)<0 + if(pv_parse_spec(&weight_param, &pv_weight) < 0 || pv_weight.type!=PVT_AVP) { - LM_ERR("cannot parse dstid avp\n"); + LM_ERR("cannot parse weight avp\n"); return -1; } - if(pv_parse_spec(&count_param, &pv_count)<0 + if(pv_parse_spec(&count_param, &pv_count) < 0 || !(pv_is_w(&pv_weight))) { - LM_ERR("cannot parse count pv or is read-only\n"); + LM_ERR("cannot parse count pv or pv is read-only\n"); return -1; } @@ -220,7 +220,7 @@ static int mod_init(void) LM_DBG("mt_char_list=%s \n", mt_char_list.s); mt_char_table_init(); - /* binding to mysql module */ + /* binding to database module */ if(db_bind_mod(&db_url, &mt_dbf)) { LM_ERR("database module not found\n"); @@ -614,7 +614,7 @@ static int mt_load_db(m_tree_t *pt) if(RES_ROWS(db_res)[0].values[0].type != DB1_STRING || RES_ROWS(db_res)[0].values[1].type != DB1_STRING) { - LM_ERR("wrond column types in db table (%d / %d)\n", + LM_ERR("wrong column types in db table (%d / %d)\n", RES_ROWS(db_res)[0].values[0].type, RES_ROWS(db_res)[0].values[1].type); goto error; @@ -1029,7 +1029,7 @@ void rpc_mtree_match(rpc_t* rpc, void* ctx) if(tr==NULL) { /* no tree with such name*/ - rpc->fault(ctx, 404, "Not found tree"); + rpc->fault(ctx, 404, "Tree not found"); goto error; } @@ -1038,7 +1038,7 @@ void rpc_mtree_match(rpc_t* rpc, void* ctx) LM_DBG("no prefix found in [%.*s] for [%.*s]\n", tname.len, tname.s, tomatch.len, tomatch.s); - rpc->fault(ctx, 404, "Not found"); + rpc->fault(ctx, 404, "Prefix not found"); } error:

1 0

git:5.5:97f9ede8: secsipid: note about libsecsipid location and failure return codes
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 97f9ede8b82cff8063c3fd1908d3c323997e9566 URL: https://github.com/kamailio/kamailio/commit/97f9ede8b82cff8063c3fd1908d3c32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:59:32+02:00 secsipid: note about libsecsipid location and failure return codes (cherry picked from commit 59719a1ac97337ca7f8b83b0e8a9d63bf6ec0c7e) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/97f9ede8b82cff8063c3fd1908d3c32… Patch: https://github.com/kamailio/kamailio/commit/97f9ede8b82cff8063c3fd1908d3c32… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 1e22e371fb..0d7147c35f 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -30,6 +30,17 @@ loads "secsipid_proc.so" in child init callback in order to initialize the "libsecsipid" per child process. </para> + <para> + The libsecsipid is provided by secsipidx project: + <ulink url="https://github.com/asipto/secsipidx">https://github.com/asipto/secsipidx</ulink>. + </para> + <para> + In case of failure, the functions in this module return error codes + (the negative values) listed in the code of libsecsipid, pretty much + at the top of: + <ulink url="https://github.com/asipto/secsipidx/blob/main/secsipid/secsipid.go" + >https://github.com/asipto/secsipidx/blob/main/secsipid/secsipid.go</ulink>. + </para> </section> <section> <title>Dependencies</title>

1 0

git:5.5:84c87444: ldap: several functions exported to kemi framework
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 84c87444a50c4e46c3786904378e980f0262309f URL: https://github.com/kamailio/kamailio/commit/84c87444a50c4e46c3786904378e980… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:58:29+02:00 ldap: several functions exported to kemi framework (cherry picked from commit 2d4b4939d1845fffdc3fa3ced9889720d0213d47) --- Modified: src/modules/ldap/ldap_exp_fn.c Modified: src/modules/ldap/ldap_exp_fn.h Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/84c87444a50c4e46c3786904378e980… Patch: https://github.com/kamailio/kamailio/commit/84c87444a50c4e46c3786904378e980…

1 0

git:5.5:45310834: secsipid: log message on identity generation failure
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 45310834376d9eee2778e16c5fdc706ab1e6f97b URL: https://github.com/kamailio/kamailio/commit/45310834376d9eee2778e16c5fdc706… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:59:04+02:00 secsipid: log message on identity generation failure (cherry picked from commit 4b7eedf5af9a461d5a1de1148c814faa5db8cbaa) --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/45310834376d9eee2778e16c5fdc706… Patch: https://github.com/kamailio/kamailio/commit/45310834376d9eee2778e16c5fdc706… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 30357a235e..18f962d362 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -327,6 +327,7 @@ static int ki_secsipid_add_identity(sip_msg_t *msg, str *origtn, str *desttn, attest->s, origid->s, x5u->s, keypath->s, &ibody.s); if(ibody.len<=0) { + LM_ERR("failed to get identity header body (%d)\n", ibody.len); goto error; } @@ -526,9 +527,7 @@ static int secsipid_libopt_param(modparam_t type, void *val) return -1; } sit->s = *((str*)val); - if(secsipid_libopt_list!=NULL) { - sit->next = secsipid_libopt_list; - } + sit->next = secsipid_libopt_list; secsipid_libopt_list = sit; return 0;

1 0

git:5.5:93dc038f: async: safety check for async ms list
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 93dc038f3f1f854b1e0987ec28e49d8a70293e19 URL: https://github.com/kamailio/kamailio/commit/93dc038f3f1f854b1e0987ec28e49d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:59:16+02:00 async: safety check for async ms list (cherry picked from commit 5b0e74c1832d2d09fe36424e1e1aaaacde920b31) --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/93dc038f3f1f854b1e0987ec28e49d8… Patch: https://github.com/kamailio/kamailio/commit/93dc038f3f1f854b1e0987ec28e49d8… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 1e81d3318c..bd17b0e1d9 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -370,6 +370,10 @@ int async_ms_sleep(sip_msg_t *msg, int milliseconds, cfg_action_t *act, str *cbn async_task_param_t *atp; async_task_t *at; + if (_async_ms_list==NULL) { + LM_ERR("async timer list not initialized - check modparams\n"); + return -1; + } if(milliseconds <= 0) { LM_ERR("negative or zero sleep time (%d)\n", milliseconds); return -1;

1 0

git:5.5:7323d812: mtree: check if pv_count var is r/w
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 7323d812dc4a39c0e60f11668e09a50ef586a8f7 URL: https://github.com/kamailio/kamailio/commit/7323d812dc4a39c0e60f11668e09a50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:57:54+02:00 mtree: check if pv_count var is r/w - reported by GH #2750 (cherry picked from commit 63b0345207ba67fcc6290d6dfc55f99ba58b13c9) --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7323d812dc4a39c0e60f11668e09a50… Patch: https://github.com/kamailio/kamailio/commit/7323d812dc4a39c0e60f11668e09a50… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index c04f031cfd..63180bbfb7 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -203,7 +203,7 @@ static int mod_init(void) } if(pv_parse_spec(&count_param, &pv_count) < 0 - || !(pv_is_w(&pv_weight))) + || !(pv_is_w(&pv_count))) { LM_ERR("cannot parse count pv or pv is read-only\n"); return -1;

1 0

git:5.5:19901d0c: core: parse via - fixed whitespacing
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 19901d0cdb6cf06a84315c19a27986bca7a05025 URL: https://github.com/kamailio/kamailio/commit/19901d0cdb6cf06a84315c19a27986b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:58:18+02:00 core: parse via - fixed whitespacing (cherry picked from commit 01664d1d82dcfe952fce29033b4fcd5e44cf2319) --- Modified: src/core/parser/parse_via.h --- Diff: https://github.com/kamailio/kamailio/commit/19901d0cdb6cf06a84315c19a27986b… Patch: https://github.com/kamailio/kamailio/commit/19901d0cdb6cf06a84315c19a27986b… --- diff --git a/src/core/parser/parse_via.h b/src/core/parser/parse_via.h index fca486e358..e4957961f1 100644 --- a/src/core/parser/parse_via.h +++ b/src/core/parser/parse_via.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -32,11 +32,11 @@ struct sip_msg; /* via param types - * WARNING: keep in sync with parse_via.c FIN_HIDDEN... + * WARNING: keep in sync with parse_via.c FIN_HIDDEN... * and with tm/sip_msg.c via_body_cloner */ enum { - PARAM_HIDDEN=230, PARAM_TTL, PARAM_BRANCH, + PARAM_HIDDEN=230, PARAM_TTL, PARAM_BRANCH, PARAM_MADDR, PARAM_RECEIVED, PARAM_RPORT, PARAM_I, PARAM_ALIAS, #ifdef USE_COMP PARAM_COMP, @@ -60,12 +60,12 @@ typedef struct via_param { /* Format: name/version/transport host:port;params comment */ - /* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ -typedef struct via_body { +/* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ +typedef struct via_body { int error; str hdr; /* Contains "Via" or "v" */ str name; - str version; + str version; str transport; str host; short proto; /* transport */ @@ -80,7 +80,7 @@ typedef struct via_body { struct via_param* param_lst; /* list of parameters*/ struct via_param* last_param; /*last via parameter, internal use*/ - /* shortcuts to "important" params*/ + /* shortcuts to "important" params*/ struct via_param* branch; str tid; /* transaction id, part of branch */ struct via_param* received; @@ -90,8 +90,8 @@ typedef struct via_body { #ifdef USE_COMP struct via_param* comp; /* see rfc3486 */ #endif - struct via_body* next; /* pointer to next via body string if - compact via or null */ + struct via_body* next; /* pointer to next via body string + if compact via or null */ } via_body_t;

1 0

git:5.5:3bfb1773: mtree: Fix some typos, adjust some formatting
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 3bfb1773c01731177824b907180a7eeb7e43d3af URL: https://github.com/kamailio/kamailio/commit/3bfb1773c01731177824b907180a7ee… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:57:45+02:00 mtree: Fix some typos, adjust some formatting (cherry picked from commit 316c80607243387015e35ac423238c5a32401a44) --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3bfb1773c01731177824b907180a7ee… Patch: https://github.com/kamailio/kamailio/commit/3bfb1773c01731177824b907180a7ee… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index badbd09dc8..c04f031cfd 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -175,37 +175,37 @@ static int mod_init(void) return -1; } - if(pv_parse_spec(&value_param, &pv_value)<00 + if(pv_parse_spec(&value_param, &pv_value) < 0 || !(pv_is_w(&pv_value))) { - LM_ERR("cannot parse value pv or is read only\n"); + LM_ERR("cannot parse value pv or pv is read-only\n"); return -1; } - if (pv_parse_spec(&values_param, &pv_values) <0 + if (pv_parse_spec(&values_param, &pv_values) < 0 || pv_values.type != PVT_AVP) { LM_ERR("cannot parse values avp\n"); return -1; } - if(pv_parse_spec(&dstid_param, &pv_dstid)<0 + if(pv_parse_spec(&dstid_param, &pv_dstid) < 0 || pv_dstid.type!=PVT_AVP) { LM_ERR("cannot parse dstid avp\n"); return -1; } - if(pv_parse_spec(&weight_param, &pv_weight)<0 + if(pv_parse_spec(&weight_param, &pv_weight) < 0 || pv_weight.type!=PVT_AVP) { - LM_ERR("cannot parse dstid avp\n"); + LM_ERR("cannot parse weight avp\n"); return -1; } - if(pv_parse_spec(&count_param, &pv_count)<0 + if(pv_parse_spec(&count_param, &pv_count) < 0 || !(pv_is_w(&pv_weight))) { - LM_ERR("cannot parse count pv or is read-only\n"); + LM_ERR("cannot parse count pv or pv is read-only\n"); return -1; } @@ -220,7 +220,7 @@ static int mod_init(void) LM_DBG("mt_char_list=%s \n", mt_char_list.s); mt_char_table_init(); - /* binding to mysql module */ + /* binding to database module */ if(db_bind_mod(&db_url, &mt_dbf)) { LM_ERR("database module not found\n"); @@ -614,7 +614,7 @@ static int mt_load_db(m_tree_t *pt) if(RES_ROWS(db_res)[0].values[0].type != DB1_STRING || RES_ROWS(db_res)[0].values[1].type != DB1_STRING) { - LM_ERR("wrond column types in db table (%d / %d)\n", + LM_ERR("wrong column types in db table (%d / %d)\n", RES_ROWS(db_res)[0].values[0].type, RES_ROWS(db_res)[0].values[1].type); goto error; @@ -1029,7 +1029,7 @@ void rpc_mtree_match(rpc_t* rpc, void* ctx) if(tr==NULL) { /* no tree with such name*/ - rpc->fault(ctx, 404, "Not found tree"); + rpc->fault(ctx, 404, "Tree not found"); goto error; } @@ -1038,7 +1038,7 @@ void rpc_mtree_match(rpc_t* rpc, void* ctx) LM_DBG("no prefix found in [%.*s] for [%.*s]\n", tname.len, tname.s, tomatch.len, tomatch.s); - rpc->fault(ctx, 404, "Not found"); + rpc->fault(ctx, 404, "Prefix not found"); } error:

1 0

git:master:fa7328ae: pv: added {param.in,name[,sep]}
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: master Commit: fa7328ae48e9596ec30c48f17f353ba10369fb87 URL: https://github.com/kamailio/kamailio/commit/fa7328ae48e9596ec30c48f17f353ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:37:38+02:00 pv: added {param.in,name[,sep]} - return 1 if param name is found in the list, 0 if not found --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/fa7328ae48e9596ec30c48f17f353ba… Patch: https://github.com/kamailio/kamailio/commit/fa7328ae48e9596ec30c48f17f353ba…

1 0

git:5.5:f481071a: sipdump: fixed typo
by Henning Westerholt 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: f481071a671009f1dcc9fe5d36870e06edc2ec4b URL: https://github.com/kamailio/kamailio/commit/f481071a671009f1dcc9fe5d36870e0… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-06-01T06:32:25Z sipdump: fixed typo (cherry picked from commit 7f226f5b08c93ed0a43113d7947730329ff7db38) --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f481071a671009f1dcc9fe5d36870e0… Patch: https://github.com/kamailio/kamailio/commit/f481071a671009f1dcc9fe5d36870e0… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 54b5c47484..0384458639 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -575,7 +575,7 @@ int pv_parse_sipdump_name(pv_spec_t *sp, str *in) case 8: if(strncmp(in->s, "src_port", 8)==0) sp->pvp.pvn.u.isname.name.n = 8; - if(strncmp(in->s, "dst_port", 8)==0) + else if(strncmp(in->s, "dst_port", 8)==0) sp->pvp.pvn.u.isname.name.n = 9; else goto error; break;

2 2

git:master:758c85a0: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 01 Jun '21

01 Jun '21

Module: kamailio Branch: master Commit: 758c85a09ebb2848d0fd2ee82c48784b8544501a URL: https://github.com/kamailio/kamailio/commit/758c85a09ebb2848d0fd2ee82c48784… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-01T10:01:13+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/758c85a09ebb2848d0fd2ee82c48784… Patch: https://github.com/kamailio/kamailio/commit/758c85a09ebb2848d0fd2ee82c48784… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index b42915943b..f4a43fca91 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -100,6 +100,14 @@ Chapter 1. Admin Guide module loads "secsipid_proc.so" in child init callback in order to initialize the "libsecsipid" per child process. + The libsecsipid is provided by secsipidx project: + https://github.com/asipto/secsipidx. + + In case of failure, the functions in this module return error codes + (the negative values) listed in the code of libsecsipid, pretty much at + the top of: + https://github.com/asipto/secsipidx/blob/main/secsipid/secsipid.go. + 2. Dependencies 2.1. Kamailio Modules

1 0

git:master:59719a1a: secsipid: note about libsecsipid location and failure return codes
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: master Commit: 59719a1ac97337ca7f8b83b0e8a9d63bf6ec0c7e URL: https://github.com/kamailio/kamailio/commit/59719a1ac97337ca7f8b83b0e8a9d63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T09:51:04+02:00 secsipid: note about libsecsipid location and failure return codes --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/59719a1ac97337ca7f8b83b0e8a9d63… Patch: https://github.com/kamailio/kamailio/commit/59719a1ac97337ca7f8b83b0e8a9d63… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 1e22e371fb..0d7147c35f 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -30,6 +30,17 @@ loads "secsipid_proc.so" in child init callback in order to initialize the "libsecsipid" per child process. </para> + <para> + The libsecsipid is provided by secsipidx project: + <ulink url="https://github.com/asipto/secsipidx">https://github.com/asipto/secsipidx</ulink>. + </para> + <para> + In case of failure, the functions in this module return error codes + (the negative values) listed in the code of libsecsipid, pretty much + at the top of: + <ulink url="https://github.com/asipto/secsipidx/blob/main/secsipid/secsipid.go" + >https://github.com/asipto/secsipidx/blob/main/secsipid/secsipid.go</ulink>. + </para> </section> <section> <title>Dependencies</title>

1 0

git:master:bf4ae4b5: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 01 Jun '21

01 Jun '21

Module: kamailio Branch: master Commit: bf4ae4b5f4f4b75c534681c520fa1060f234a18e URL: https://github.com/kamailio/kamailio/commit/bf4ae4b5f4f4b75c534681c520fa106… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-01T09:31:20+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/bf4ae4b5f4f4b75c534681c520fa106… Patch: https://github.com/kamailio/kamailio/commit/bf4ae4b5f4f4b75c534681c520fa106… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 0fa395da20..8e5c790d58 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -66,7 +66,7 @@ Ovidiu Sas 5.5. nat_uac_test(flags) 5.6. is_rfc1918(ip_address) 5.7. add_contact_alias([ip_addr, port, proto]) - 5.8. handle_ruri_alias() + 5.8. handle_ruri_alias([mode]) 5.9. set_contact_alias([trim]) 5.10. set_alias_to_pv(target_avp) @@ -157,7 +157,7 @@ Chapter 1. Admin Guide 5.5. nat_uac_test(flags) 5.6. is_rfc1918(ip_address) 5.7. add_contact_alias([ip_addr, port, proto]) - 5.8. handle_ruri_alias() + 5.8. handle_ruri_alias([mode]) 5.9. set_contact_alias([trim]) 5.10. set_alias_to_pv(target_avp) @@ -497,7 +497,7 @@ modparam("nathelper", "nat_addr_mode", 0) 5.5. nat_uac_test(flags) 5.6. is_rfc1918(ip_address) 5.7. add_contact_alias([ip_addr, port, proto]) - 5.8. handle_ruri_alias() + 5.8. handle_ruri_alias([mode]) 5.9. set_contact_alias([trim]) 5.10. set_alias_to_pv(target_avp) @@ -668,7 +668,7 @@ if(is_rfc1918("$rd")) { }; ... -5.8. handle_ruri_alias() +5.8. handle_ruri_alias([mode]) Checks if the Request URI has an “alias” parameter and if so, removes it and sets the “$du” based on its value. Note that this means that @@ -677,6 +677,10 @@ if(is_rfc1918("$rd")) { on a request, make sure that you screen the alias parameter value of Request URI the same way as you would screen the Request URI itself. + The optional parameter mode can be 0 to consume first alias parameter, + otherwise it consumes the last alias parameter. If the parameter mode + is not provided, it consumes the first parameter. + Returns 1 if “;alias” parameter was found and “$du” was set and the “$ru” rewritten, 2 if the alias parameter was not found and nothing was done, or -1 in case of error.

1 0

git:master:48520609: nathelper: optional parameter mode for handle_ruri_alias()
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: master Commit: 48520609d25dfee6987b16223ed20da507274fdf URL: https://github.com/kamailio/kamailio/commit/48520609d25dfee6987b16223ed20da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T09:29:33+02:00 nathelper: optional parameter mode for handle_ruri_alias() - if not 0, then consume the last alias parameter instead of the first one --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/48520609d25dfee6987b16223ed20da… Patch: https://github.com/kamailio/kamailio/commit/48520609d25dfee6987b16223ed20da…

1 0

git:master:9c060a66: nathelper: docs for mode parameter for handle_ruri_alias()
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: master Commit: 9c060a66f83a42c46767f5b28b6a3640764ebb87 URL: https://github.com/kamailio/kamailio/commit/9c060a66f83a42c46767f5b28b6a364… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T09:29:33+02:00 nathelper: docs for mode parameter for handle_ruri_alias() --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9c060a66f83a42c46767f5b28b6a364… Patch: https://github.com/kamailio/kamailio/commit/9c060a66f83a42c46767f5b28b6a364… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 5096a676d4..39e61e6856 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -794,17 +794,21 @@ if(is_rfc1918("$rd")) { <section id="nathelper.f.handle_ruri_alias"> <title> - <function moreinfo="none">handle_ruri_alias()</function> + <function moreinfo="none">handle_ruri_alias([mode])</function> </title> <para> Checks if the Request URI has an <quote>alias</quote> parameter and if so, removes it and sets the <quote>$du</quote> based - on its value. Note that this means that routing of request is based on - <quote>;alias</quote> parameter value of the Request URI rather than + on its value. Note that this means that routing of request is based on + <quote>;alias</quote> parameter value of the Request URI rather than the Request URI itself. If you call <function>handle_ruri_alias()</function> on a request, make sure that you screen the alias parameter value of - Request URI the same way as you would screen the - Request URI itself. + Request URI the same way as you would screen the Request URI itself. + </para> + <para> + The optional parameter mode can be 0 to consume first alias parameter, + otherwise it consumes the last alias parameter. If the parameter mode is + not provided, it consumes the first parameter. </para> <para> Returns <emphasis>1</emphasis> if <quote>;alias</quote> parameter was

1 0

git:5.4:affe55c2: sipdump: fixed typo
by Henning Westerholt 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: affe55c269f77e280f8400fc6c2a5dee61a2b877 URL: https://github.com/kamailio/kamailio/commit/affe55c269f77e280f8400fc6c2a5de… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-06-01T06:32:05Z sipdump: fixed typo (cherry picked from commit 7f226f5b08c93ed0a43113d7947730329ff7db38) --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/affe55c269f77e280f8400fc6c2a5de… Patch: https://github.com/kamailio/kamailio/commit/affe55c269f77e280f8400fc6c2a5de… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 41550e78f2..553daa01df 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -629,7 +629,7 @@ int pv_parse_sipdump_name(pv_spec_t *sp, str *in) case 8: if(strncmp(in->s, "src_port", 8)==0) sp->pvp.pvn.u.isname.name.n = 8; - if(strncmp(in->s, "dst_port", 8)==0) + else if(strncmp(in->s, "dst_port", 8)==0) sp->pvp.pvn.u.isname.name.n = 9; else goto error; break;

1 0

[kamailio/kamailio] sipdump: fixed typo (#2753)
by sergey-safarov 01 Jun '21

01 Jun '21

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description fixed `4sipdump(src_port)` handling You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2753 -- Commit Summary -- * sipdump: fixed typo -- File Changes -- M src/modules/sipdump/sipdump_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2753.patch https://github.com/kamailio/kamailio/pull/2753.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2753

2 2

git:master:7f226f5b: sipdump: fixed typo
by Henning Westerholt 01 Jun '21

01 Jun '21

Module: kamailio Branch: master Commit: 7f226f5b08c93ed0a43113d7947730329ff7db38 URL: https://github.com/kamailio/kamailio/commit/7f226f5b08c93ed0a43113d79477303… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-06-01T08:31:15+02:00 sipdump: fixed typo --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7f226f5b08c93ed0a43113d79477303… Patch: https://github.com/kamailio/kamailio/commit/7f226f5b08c93ed0a43113d79477303… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 9b733dad66..77c7c8606f 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -662,7 +662,7 @@ int pv_parse_sipdump_name(pv_spec_t *sp, str *in) case 8: if(strncmp(in->s, "src_port", 8)==0) sp->pvp.pvn.u.isname.name.n = 8; - if(strncmp(in->s, "dst_port", 8)==0) + else if(strncmp(in->s, "dst_port", 8)==0) sp->pvp.pvn.u.isname.name.n = 9; else goto error; break;

1 0

[kamailio/kamailio] Error loading globalblacklist on startup Kamailio 5.4.1 (#2480)
by Earn330 31 May '21

31 May '21

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data #### Log Messages ``` Sep 17 07:56:36 voip-lab-proxy03 /usr/sbin/kamailio[553]: DEBUG: <core> [core/route.c:885]: fix_actions(): fixing check_blacklist() Sep 17 07:56:36 voip-lab-proxy03 /usr/sbin/kamailio[553]: DEBUG: userblacklist [userblacklist.c:472]: add_source(): add table globalblacklist Sep 17 07:56:36 voip-lab-proxy03 /usr/sbin/kamailio[553]: DEBUG: <core> [dtrie.c:57]: dtrie_init(): allocate 16 bytes for root at 0x7fc29efa4ab0 Sep 17 07:56:36 voip-lab-proxy03 /usr/sbin/kamailio[553]: DEBUG: <core> [dtrie.c:67]: dtrie_init(): allocate 80 bytes for 10 root children pointer at 0x7fc29efa4b28 Sep 17 07:56:36 voip-lab-proxy03 /usr/sbin/kamailio[553]: ERROR: <core> [db.c:481]: db_use_table(): invalid parameter value Sep 17 07:56:36 voip-lab-proxy03 /usr/sbin/kamailio[553]: ERROR: userblacklist [db.c:123]: db_reload_source(): cannot use db table 'globalblacklist' Sep 17 07:56:36 voip-lab-proxy03 /usr/sbin/kamailio[553]: ERROR: userblacklist [userblacklist.c:425]: load_source(): cannot load source from 'globalblacklist' ``` ### Additional Information ``` Kamailio 5.4.1 ``` * **Operating System**: ``` PRETTY_NAME="Debian GNU/Linux 10 (buster)" NAME="Debian GNU/Linux" VERSION_ID="10" VERSION="10 (buster)" VERSION_CODENAME=buster ID=debian HOME_URL="https://www.debian.org/" SUPPORT_URL="https://www.debian.org/support" BUG_REPORT_URL="https://bugs.debian.org/" Linux voip-lab-proxy03 4.19.0-10-amd64 #1 SMP Debian 4.19.132-1 (2020-07-24) x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2480

3 9

[kamailio/kamailio] cannot parse From header (#2723)
by sergey-safarov 31 May '21

31 May '21

### Description For some reason `From` header cannot be parsed. #### Reproduction Tested config ``` listen=udp:127.0.0.1:5060 loadmodule "pv.so" loadmodule "http_client.so" loadmodule "lost.so" modparam("http_client", "httpcon", "http://example.com=>http://example.com"); request_route { lost_held_query("http://example.com", "$var(pidf)", "$var(geo_url)", "$var(err)"); } ``` Client sipp ``` sipp -m 1 -sn uac -p 2345 127.0.0.1 ``` #### Log Messages Kamailio output ```` 1(7643) WARNING: lost [functions.c:252]: lost_held_function(): P-A-I header not found, trying From header ... 1(7643) ERROR: lost [utilities.c:644]: lost_get_from_header(): From header not found 1(7643) ERROR: lost [functions.c:259]: lost_held_function(): no device id found 2(7644) WARNING: lost [functions.c:252]: lost_held_function(): P-A-I header not found, trying From header ... 2(7644) ERROR: lost [utilities.c:644]: lost_get_from_header(): From header not found 2(7644) ERROR: lost [functions.c:259]: lost_held_function(): no device id found 3(7645) WARNING: lost [functions.c:252]: lost_held_function(): P-A-I header not found, trying From header ... 3(7645) ERROR: lost [utilities.c:644]: lost_get_from_header(): From header not found 3(7645) ERROR: lost [functions.c:259]: lost_held_function(): no device id found ```` #### SIP Traffic ``` INVITE sip:service@127.0.0.1:5060 SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:2345;branch=z9hG4bK-7655-1-0 From: sipp <sip:sipp@127.0.0.1:2345>;tag=7655SIPpTag001 To: service <sip:service@127.0.0.1:5060> Call-ID: 1-7655(a)127.0.0.1 CSeq: 1 INVITE Contact: sip:sipp@127.0.0.1:2345 Max-Forwards: 70 Subject: Performance Test Content-Type: application/sdp Content-Length: 129 v=0 o=user1 53655765 2353687637 IN IP4 127.0.0.1 s=- c=IN IP4 127.0.0.1 t=0 0 m=audio 6000 RTP/AVP 0 a=rtpmap:0 PCMU/8000 ``` ### Additional Information current master * **Operating System**: CentOS 8 x86_64 -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2723

3 18

git:master:5b0e74c1: async: safety check for async ms list
by Daniel-Constantin Mierla 31 May '21

31 May '21

Module: kamailio Branch: master Commit: 5b0e74c1832d2d09fe36424e1e1aaaacde920b31 URL: https://github.com/kamailio/kamailio/commit/5b0e74c1832d2d09fe36424e1e1aaaa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-31T17:23:42+02:00 async: safety check for async ms list --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/5b0e74c1832d2d09fe36424e1e1aaaa… Patch: https://github.com/kamailio/kamailio/commit/5b0e74c1832d2d09fe36424e1e1aaaa… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 1e81d3318c..bd17b0e1d9 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -370,6 +370,10 @@ int async_ms_sleep(sip_msg_t *msg, int milliseconds, cfg_action_t *act, str *cbn async_task_param_t *atp; async_task_t *at; + if (_async_ms_list==NULL) { + LM_ERR("async timer list not initialized - check modparams\n"); + return -1; + } if(milliseconds <= 0) { LM_ERR("negative or zero sleep time (%d)\n", milliseconds); return -1;

1 0

git:master:4b7eedf5: secsipid: log message on identity generation failure
by Daniel-Constantin Mierla 31 May '21

31 May '21

Module: kamailio Branch: master Commit: 4b7eedf5af9a461d5a1de1148c814faa5db8cbaa URL: https://github.com/kamailio/kamailio/commit/4b7eedf5af9a461d5a1de1148c814fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-31T15:02:01+02:00 secsipid: log message on identity generation failure --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4b7eedf5af9a461d5a1de1148c814fa… Patch: https://github.com/kamailio/kamailio/commit/4b7eedf5af9a461d5a1de1148c814fa… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 30357a235e..18f962d362 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -327,6 +327,7 @@ static int ki_secsipid_add_identity(sip_msg_t *msg, str *origtn, str *desttn, attest->s, origid->s, x5u->s, keypath->s, &ibody.s); if(ibody.len<=0) { + LM_ERR("failed to get identity header body (%d)\n", ibody.len); goto error; } @@ -526,9 +527,7 @@ static int secsipid_libopt_param(modparam_t type, void *val) return -1; } sit->s = *((str*)val); - if(secsipid_libopt_list!=NULL) { - sit->next = secsipid_libopt_list; - } + sit->next = secsipid_libopt_list; secsipid_libopt_list = sit; return 0;

1 0

git:master:48aa0500: ldap: Makefile - define LDAP_DEPRECATED=1
by Daniel-Constantin Mierla 31 May '21

31 May '21

Module: kamailio Branch: master Commit: 48aa05002e3bd4fba120a0c157a8cc5e70c57441 URL: https://github.com/kamailio/kamailio/commit/48aa05002e3bd4fba120a0c157a8cc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-31T13:49:59+02:00 ldap: Makefile - define LDAP_DEPRECATED=1 --- Modified: src/modules/ldap/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/48aa05002e3bd4fba120a0c157a8cc5… Patch: https://github.com/kamailio/kamailio/commit/48aa05002e3bd4fba120a0c157a8cc5… --- diff --git a/src/modules/ldap/Makefile b/src/modules/ldap/Makefile index 54a8a78421..ebb68db4b1 100644 --- a/src/modules/ldap/Makefile +++ b/src/modules/ldap/Makefile @@ -19,4 +19,6 @@ ifeq ($(OS),solaris) LIBS=-L$(LOCALBASE)/lib -L/usr/sfw/lib -L/usr/local/lib -L/opt/sfw/lib -I/opt/csw/lib -lldap endif +DEFS+=-DLDAP_DEPRECATED=1 + include ../../Makefile.modules

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev