sr-dev October 2018

sr-dev@lists.kamailio.org

23 participants
274 discussions

git:master:783763e8: pdb: fix SIGABRT in case of too long uris

by Lucian Balaceanu

Module: kamailio Branch: master Commit: 783763e8accef47aa563cd17d1e170250268751c URL: https://github.com/kamailio/kamailio/commit/783763e8accef47aa563cd17d1e1702… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2018-10-29T11:54:45+02:00 pdb: fix SIGABRT in case of too long uris buf in pdb_msg_dbg should correctly accomodate for pdb_bdy size pdb_hdr + pdb_bdy should add to pdb_hdr.length (max 255) --- Modified: src/modules/pdb/common.h Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/783763e8accef47aa563cd17d1e1702… Patch: https://github.com/kamailio/kamailio/commit/783763e8accef47aa563cd17d1e1702… --- diff --git a/src/modules/pdb/common.h b/src/modules/pdb/common.h index 1ba16cdf98..7c52c97ce0 100644 --- a/src/modules/pdb/common.h +++ b/src/modules/pdb/common.h @@ -35,7 +35,8 @@ #define OTHER_CARRIERID 1000 #define MAX_CARRIERID 1000 #define NULL_CARRIERID -1001 -#define PAYLOADSIZE 256 +/* hdr size + PAYLOADSIZE must add to 255 (uint8_t pdb_hdr.length) */ +#define PAYLOADSIZE 249 #define IS_VALID_PDB_CARRIERID(id) ((id>=MIN_PDB_CARRIERID) && (id<=MAX_PDB_CARRIERID)) diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 8f2f80c326..eb59656734 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -145,7 +145,7 @@ static struct server_list_t *server_list; /* debug function for the new client <-> server protocol */ static void pdb_msg_dbg(struct pdb_msg msg, char *dbg_msg) { int i; - char buf[PAYLOADSIZE]; + char buf[PAYLOADSIZE * 3 + 1]; char *ptr = buf; for (i = 0; i < msg.hdr.length - sizeof(msg.hdr); i++) { @@ -265,7 +265,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct /* prepare request */ reqlen = number.len + 1; /* include null termination */ - if (reqlen > sizeof(struct pdb_bdy)) { + if (reqlen > PAYLOADSIZE) { LM_ERR("number too long '%.*s'.\n", number.len, number.s); return -1; } @@ -305,6 +305,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct break; } + memset(&msg, 0, sizeof(struct pdb_msg)); /* wait for response */ for (;;) { if (gettimeofday(&tnow, NULL) != 0) {

6 years

git:master:6745a6c7: rabbitmq: use fixup spve all

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6745a6c784218130a28896cbfa4ea520047d8fc6 URL: https://github.com/kamailio/kamailio/commit/6745a6c784218130a28896cbfa4ea52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-30T07:21:48+01:00 rabbitmq: use fixup spve all - allow tracking parameter number - prefix to avoid conflict of common name function --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/6745a6c784218130a28896cbfa4ea52… Patch: https://github.com/kamailio/kamailio/commit/6745a6c784218130a28896cbfa4ea52… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 45556ef196..d5eedbdbf4 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -85,7 +85,7 @@ static int rabbitmq_disconnect(amqp_connection_state_t *conn); static int rabbitmq_reconnect(amqp_connection_state_t *conn); /* module fixup functions */ -static int fixup_params(void **param, int param_no) +static int rbmq_fixup_params(void **param, int param_no) { if(param_no == 5) { if(fixup_pvar_null(param, 1) != 0) { @@ -98,18 +98,18 @@ static int fixup_params(void **param, int param_no) } return 0; } else { - return fixup_spve_null(param, 1); + return fixup_spve_all(param, param_no); } return -1; } -static int fixup_free_params(void **param, int param_no) +static int rbmq_fixup_free_params(void **param, int param_no) { if(param_no == 5) { return fixup_free_pvar_null(param, 1); } else { - return fixup_free_spve_null(param, 1); + return fixup_free_spve_all(param, param_no); } return -1; @@ -117,10 +117,10 @@ static int fixup_free_params(void **param, int param_no) /* module commands */ static cmd_export_t cmds[] = { - {"rabbitmq_publish", (cmd_function)rabbitmq_publish, 4, fixup_params, - fixup_free_params, REQUEST_ROUTE}, + {"rabbitmq_publish", (cmd_function)rabbitmq_publish, 4, fixup_spve_all, + fixup_free_spve_all, REQUEST_ROUTE}, {"rabbitmq_publish_consume", (cmd_function)rabbitmq_publish_consume, 5, - fixup_params, fixup_free_params, REQUEST_ROUTE}, + rbmq_fixup_params, rbmq_fixup_free_params, REQUEST_ROUTE}, {0, 0, 0, 0, 0, 0} };

6 years

[kamailio/kamailio] when using terminate_dlg via xmlrpc, not able to generate proper bye message, if request is behind nat. (#1689)

by Surendra Tiwari

### Description Using xmlrpc command to generate the bye using terminate_dlg request:  ### Troubleshooting #### Reproduction use xmlrpc request to terminate the dialog ``` curl --data @xmlrpc http://13.57.122.212:8080/RPC ``` xmlrpc file will have following things ``` <?xml version="1.0"?> <methodCall> <methodName>dlg.terminate_dlg</methodName> <params> <param><value><string>fe6361a2-52f0-1237-e5a2-06119108e458</string></value></param> <param><value><string>07322vj6a8taa</string></value></param> <param><value><string>gK09f669d8</string></value></param> </params> </methodCall> ```  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` **Bye message without xmlrpc** BYE sip:gw+plivo.com@13.57.90.158:5080;transport=tcp;transport=tcp;gw=plivo.com;alias=13.57.90.158~49325~2 SIP/2.0. Record-Route: <sip:13.57.122.212;lr;ftag=gK07d4ffc2>. Record-Route: <sip:18.214.109.132:5060;lr;ftag=gK07d4ffc2>. Via: SIP/2.0/UDP 13.57.122.212:5060;branch=z9hG4bK154c.8fa2a8729a68989c41230f0906bcd2bd.0. Via: SIP/2.0/UDP 18.214.109.132:5060;rport=5060;branch=z9hG4bK154c.44759fe4.0. Via: SIP/2.0/UDP 81.52.176.68:5060;branch=z9hG4bK07Badb05d2bebab0ac9. From: <sip:+919967609476@81.52.176.68>;tag=gK07d4ffc2. To: "919967609476" <sip:+919967609476@54.183.206.134>;tag=5SDBNUapcZv5m. Call-ID: 237f21f0-52db-1237-e5a2-06119108e458. CSeq: 29061 BYE. Max-Forwards: 68. Route: <sip:54.183.206.134:5060;r2=on;lr;ftag=5SDBNUapcZv5m;nat=yes>. Route: <sip:54.183.206.134:5060;transport=tcp;r2=on;lr;ftag=5SDBNUapcZv5m;nat=yes>. Reason: Q.850;cause=16. Content-Length: 0. .. **Bye message using xmlrpc request** U 172.31.4.160:5060 -> 54.183.206.134:5060 BYE sip:gw+plivo.com@13.57.90.158:5080;transport=tcp;transport=tcp;gw=plivo.com SIP/2.0. Via: SIP/2.0/UDP 13.57.122.212:5060;branch=z9hG4bK7841.79765615000000000000000000000000.0. To: <sip:suren1002170622114516@54.183.206.134>;tag=Hv494Z9D8D9rH. From: <sip:919967609476@54.183.206.134>;tag=gK0cf13bdd. CSeq: 1 BYE. Call-ID: 56783745-52ef-1237-e5a2-06119108e458. Route: <sip:54.183.206.134:5060;r2=on;lr;ftag=Hv494Z9D8D9rH;nat=yes>, <sip:54.183.206.134;transport=tcp;r2=on;lr;ftag=Hv494Z9D8D9rH;nat=yes>. Content-Length: 0. User-Agent: kamailio (5.1.4 (x86_64/linux)). Max-Forwards: 70. .. ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@ip-172-31-4-160:/etc/kamailio# kamailio -version version: kamailio 5.1.4 (x86_64/linux) 6ebfda flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 6ebfda compiled on 11:48:26 Sep 7 2018 with gcc 4.8.4 ``` * **Operating System**:  ``` root@ip-172-31-4-160:/etc/kamailio# lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 14.04.5 LTS Release: 14.04 Codename: trusty root@ip-172-31-4-160:/etc/kamailio# uname -a Linux ip-172-31-4-160 3.13.0-143-generic #192-Ubuntu SMP Tue Feb 27 10:45:36 UTC 2018 x86_64 x86_64 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/1689

6 years

[kamailio/kamailio] Dialog: generating the request uri with alias when route header present (#1695)

by Surendra Tiwari

#### 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 - [x] Tested changes locally - [x] Related to issue #1689 (replace XXXX with an open issue number) #### Description Using contact as request uri when there is route header present in the dialog  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1695 -- Commit Summary -- * Dialog: generating the request uri with alias when route header present -- File Changes -- M src/modules/dialog/dlg_req_within.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1695.patch https://github.com/kamailio/kamailio/pull/1695.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/1695

6 years

git:master:810d8498: dialog: handle alias in contact address for local bye only when no route headers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 810d84981b4ed83b11e4090740a36653ec10ef16 URL: https://github.com/kamailio/kamailio/commit/810d84981b4ed83b11e4090740a3665… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-29T07:27:58+01:00 dialog: handle alias in contact address for local bye only when no route headers - GH #1689 --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/810d84981b4ed83b11e4090740a3665… Patch: https://github.com/kamailio/kamailio/commit/810d84981b4ed83b11e4090740a3665… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index d37bbbf514..62693808c8 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -77,8 +77,8 @@ dlg_t * build_dlg_t(struct dlg_cell * cell, int dir){ unsigned int loc_seq; char nbuf[MAX_URI_SIZE]; char dbuf[80]; - str nuri; - str duri; + str nuri = STR_NULL; + str duri = STR_NULL; size_t sz; char *p; @@ -87,14 +87,16 @@ dlg_t * build_dlg_t(struct dlg_cell * cell, int dir){ LM_ERR("no contact available\n"); goto error; } - /*restore alias parameter*/ - nuri.s = nbuf; - nuri.len = MAX_URI_SIZE; - duri.s = dbuf; - duri.len = 80; - if(uri_restore_rcv_alias(&cell->contact[dir], &nuri, &duri)<0) { - nuri.len = 0; - duri.len = 0; + if(cell->route_set[dir].s==NULL || cell->route_set[dir].len<=0){ + /*try to restore alias parameter if no route set */ + nuri.s = nbuf; + nuri.len = MAX_URI_SIZE; + duri.s = dbuf; + duri.len = 80; + if(uri_restore_rcv_alias(&cell->contact[dir], &nuri, &duri)<0) { + nuri.len = 0; + duri.len = 0; + } } if(nuri.len>0 && duri.len>0) { sz = sizeof(dlg_t) + (nuri.len+duri.len+2)*sizeof(char); @@ -103,7 +105,6 @@ dlg_t * build_dlg_t(struct dlg_cell * cell, int dir){ } td = (dlg_t*)pkg_malloc(sz); if(!td){ - LM_ERR("out of pkg memory\n"); return NULL; } @@ -122,13 +123,12 @@ dlg_t * build_dlg_t(struct dlg_cell * cell, int dir){ /*route set*/ if( cell->route_set[dir].s && cell->route_set[dir].len){ - - if( parse_rr_body(cell->route_set[dir].s, cell->route_set[dir].len, + if( parse_rr_body(cell->route_set[dir].s, cell->route_set[dir].len, &td->route_set) !=0){ LM_ERR("failed to parse route set\n"); goto error; } - } + } if(nuri.len>0 && duri.len>0) { /* req uri */ @@ -153,7 +153,7 @@ dlg_t * build_dlg_t(struct dlg_cell * cell, int dir){ td->id.rem_tag = cell->tag[dir]; td->id.loc_tag = (dir == DLG_CALLER_LEG) ? cell->tag[DLG_CALLEE_LEG]: cell->tag[DLG_CALLER_LEG]; - + td->state= DLG_CONFIRMED; td->send_sock = cell->bind_addr[dir];

6 years

[kamailio/kamailio] Dialog : Handling Alias in the request uri when having route header (#1694)

by Surendra Tiwari

#### 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 - [x] Tested changes locally - [x] Related to issue #1689 (replace XXXX with an open issue number) #### Description Copying the contact header to request uri , when we have route header present in the dialog. This is basically needed for generating the call termination request using XMLRPC.  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1694 -- Commit Summary -- * Modules: Handling Alias in the request uri when having route header -- File Changes -- M src/modules/dialog/dlg_req_within.c (875) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1694.patch https://github.com/kamailio/kamailio/pull/1694.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/1694

6 years

compile source file in subdirectory of module

by Mojtaba

Hi, Let me know how i could add subdirectory in Makefile for module? I am developing new module for kamailio. Some source files pasted in subdirectory of main module. I need to compile them when i run make -C command. But know it just compile all source file that exist in current directory of module. With best regards -- --Mojtaba Esfandiari.S

6 years

git:master:98ee25c6: modules: readme files regenerated - nsq ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 98ee25c6da118cadedd98621c580ed4df3a7e860 URL: https://github.com/kamailio/kamailio/commit/98ee25c6da118cadedd98621c580ed4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-10-27T15:46:44+02:00 modules: readme files regenerated - nsq ... [skip ci] --- Modified: src/modules/nsq/README --- Diff: https://github.com/kamailio/kamailio/commit/98ee25c6da118cadedd98621c580ed4… Patch: https://github.com/kamailio/kamailio/commit/98ee25c6da118cadedd98621c580ed4…

6 years

git:master:549106f5: Merge pull request #1685 from kamailio/nsq-deprecate-duplicate-func

by GitHub

Module: kamailio Branch: master Commit: 549106f591fc33bdc1e1aec26bd765d1ee4376ce URL: https://github.com/kamailio/kamailio/commit/549106f591fc33bdc1e1aec26bd765d… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: GitHub <noreply(a)github.com> Date: 2018-10-27T09:37:33-04:00 Merge pull request #1685 from kamailio/nsq-deprecate-duplicate-func nsq: deprecate json and pua funcs for json api and pua_json modules --- Modified: src/modules/nsq/Makefile Modified: src/modules/nsq/doc/nsq_admin.xml Modified: src/modules/nsq/nsq_mod.c Modified: src/modules/nsq/nsq_mod.h Modified: src/modules/nsq/nsq_reader.c Modified: src/modules/nsq/nsq_reader.h Removed: src/modules/nsq/nsq_json.c Removed: src/modules/nsq/nsq_json.h Removed: src/modules/nsq/nsq_pua.c Removed: src/modules/nsq/nsq_pua.h Removed: src/modules/nsq/nsq_trans.c Removed: src/modules/nsq/nsq_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/549106f591fc33bdc1e1aec26bd765d… Patch: https://github.com/kamailio/kamailio/commit/549106f591fc33bdc1e1aec26bd765d…

6 years

git:master:1f09a389: nsq: deprecate json and pua funcs for json api and pua_json modules

by Emmanuel Schmidbauer

Module: kamailio Branch: master Commit: 1f09a38982a64e0d6031d9e55e27e81e5f934c24 URL: https://github.com/kamailio/kamailio/commit/1f09a38982a64e0d6031d9e55e27e81… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Date: 2018-10-24T11:20:19-04:00 nsq: deprecate json and pua funcs for json api and pua_json modules --- Modified: src/modules/nsq/Makefile Modified: src/modules/nsq/doc/nsq_admin.xml Modified: src/modules/nsq/nsq_mod.c Modified: src/modules/nsq/nsq_mod.h Modified: src/modules/nsq/nsq_reader.c Modified: src/modules/nsq/nsq_reader.h Removed: src/modules/nsq/nsq_json.c Removed: src/modules/nsq/nsq_json.h Removed: src/modules/nsq/nsq_pua.c Removed: src/modules/nsq/nsq_pua.h Removed: src/modules/nsq/nsq_trans.c Removed: src/modules/nsq/nsq_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/1f09a38982a64e0d6031d9e55e27e81… Patch: https://github.com/kamailio/kamailio/commit/1f09a38982a64e0d6031d9e55e27e81…

6 years

← Newer
1
...
6
7
8
9
10
11
12
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2018