March 2012 - sr-dev - kamailio.org

git:master: module: modules/sipcapture fixed socket_info structure.
by Alexandr Dubovikov 05 Mar '12

05 Mar '12

Module: sip-router Branch: master Commit: f9494494d59d2036f2ed664fbdf4193760662937 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f949449… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Mon Mar 5 11:56:50 2012 +0100 module: modules/sipcapture fixed socket_info structure. Now users can use $Ri, $rp variables in RAW socket mode. --- modules/sipcapture/sipcapture.c | 94 ++++++++++++++++++++++++++++----------- 1 files changed, 68 insertions(+), 26 deletions(-) diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 837ac97..7e3a228 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -1465,6 +1465,9 @@ int raw_capture_rcv_loop(int rsock, int port1, int port2, int ipip) { unsigned short dst_port; unsigned short src_port; struct ip_addr dst_ip, src_ip; + struct socket_info* si = 0; + int tmp_len; + for(;;){ @@ -1514,28 +1517,6 @@ int raw_capture_rcv_loop(int rsock, int port1, int port2, int ipip) { } } - /*FIL IPs*/ - dst_ip.af=AF_INET; - dst_ip.len=4; - dst_ip.u.addr32[0]=iph->ip_dst.s_addr; - /* fill dst_port */ - dst_port=ntohs(udph->uh_dport); - ip_addr2su(&to, &dst_ip, dst_port); - /* fill src_port */ - src_port=ntohs(udph->uh_sport); - src_ip.af=AF_INET; - src_ip.len=4; - src_ip.u.addr32[0]=iph->ip_src.s_addr; - ip_addr2su(&from, &src_ip, src_port); - su_setport(&from, src_port); - - ri.src_su=from; - su2ip_addr(&ri.src_ip, &from); - ri.src_port=src_port; - su2ip_addr(&ri.dst_ip, &to); - ri.dst_port=dst_port; - ri.proto=PROTO_UDP; - /* cut off the offset */ len -= offset; @@ -1544,13 +1525,74 @@ int raw_capture_rcv_loop(int rsock, int port1, int port2, int ipip) { continue; } + /* fill dst_port && src_port */ + dst_port=ntohs(udph->uh_dport); + src_port=ntohs(udph->uh_sport); + + DBG("PORT: [%d] and [%d]\n", port1, port2); - if((!port1 && !port2) - || (src_port >= port1 && src_port <= port2) || (dst_port >= port1 && dst_port <= port2) - || (!port2 && (src_port == port1 || dst_port == port1))) - receive_msg(buf+offset, len, &ri); + if((!port1 && !port2) || (src_port >= port1 && src_port <= port2) + || (dst_port >= port1 && dst_port <= port2) + || (!port2 && (src_port == port1 || dst_port == port1))) { + + /*FIL IPs*/ + dst_ip.af=AF_INET; + dst_ip.len=4; + dst_ip.u.addr32[0]=iph->ip_dst.s_addr; + + /* fill dst_port */ + ip_addr2su(&to, &dst_ip, dst_port); + + /* fill src_port */ + src_ip.af=AF_INET; + src_ip.len=4; + src_ip.u.addr32[0]=iph->ip_src.s_addr; + ip_addr2su(&from, &src_ip, src_port); + su_setport(&from, src_port); + + ri.src_su=from; + su2ip_addr(&ri.src_ip, &from); + ri.src_port=src_port; + su2ip_addr(&ri.dst_ip, &to); + ri.dst_port=dst_port; + ri.proto=PROTO_UDP; + + /* a little bit memory */ + si=(struct socket_info*) pkg_malloc(sizeof(struct socket_info)); + if (si==0) { + LOG(L_ERR, "ERROR: new_sock_info: memory allocation error\n"); + return 0; + } + + memset(si, 0, sizeof(struct socket_info)); + si->address = ri.dst_ip; + si->socket=-1; + + /* set port & proto */ + si->port_no = dst_port; + si->proto=PROTO_UDP; + si->flags=0; + si->addr_info_lst=0; + + si->port_no_str.s = int2str(si->port_no, &tmp_len); + si->port_no_str.len = tmp_len; + + si->address_str.s = ip_addr2a(&si->address);; + si->address_str.len = strlen(si->address_str.s); + + si->name.len = si->address_str.len; + si->name.s = si->address_str.s; + + ri.bind_address=si; + + /* and now recieve message */ + receive_msg(buf+offset, len, &ri); + if(si) pkg_free(si); + } } return 0; } + +

1 0

[tracker] Comment added: pua_dialoginfo: set PUBLISH R-URIs via AVPs (Attachment added)
by sip-router 04 Mar '12

04 Mar '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#197 - pua_dialoginfo: set PUBLISH R-URIs via AVPs User who did this - Jasmin Schnatterbeck (jasmin) ---------- Thanks for your suggestions! I have updated the patch - now there is a module parameter available for setting a flag that indicates whether to send PUBLISH requests or not. If the flag has not been set, the default behaviour is to check if the PUBLISH R-URI is local or not. It does not depend on the R-URI via AVP functionality. Regarding the SHM OPs I see 2 possibilities - first determine how much memory we need, then reserve that amount of SHM memory in one OP and write on it (that means searching the AVP lists 2 times). - reserve and write in PKG MEM, then reserve and copy to SHM MEM, then delete PKG MEM What would you prefer? I plan to integrate functionality for individualizing the xml target elements (for Call pickup). The idea is, that the script writer then has the option to set a proxy, that should receive the INVITE of the new call, that aims to pick up the ringing call - because then the new call can be monitored by pua_dialoginfo on that proxy. This could be done by putting the desired proxy in the target uri and to set the "real" target-URI (as obtained from the Contact-Header e.g. of the orig INVITE) as URI-Param. Are there other suggestions/ideas on how to realize that? Jasmin ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=197#comment504 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:3.2: core: added back the option to use name IDs for tos setting
by Daniel-Constantin Mierla 04 Mar '12

04 Mar '12

Module: sip-router Branch: 3.2 Commit: 118a79b43e87a44184088a57ddc81c5e6411750e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=118a79b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 4 17:22:30 2012 +0100 core: added back the option to use name IDs for tos setting - reported by Olle E. Johansson (cherry picked from commit d3eb5d4f21f20a9bc5457642ad5fdcb9e764a02c) --- cfg.y | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/cfg.y b/cfg.y index 9317541..dae8fbf 100644 --- a/cfg.y +++ b/cfg.y @@ -111,6 +111,7 @@ #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> +#include <netinet/ip.h> #include <arpa/inet.h> #include <string.h> #include <errno.h> @@ -1598,6 +1599,33 @@ assign_stm: } | MCAST_TTL EQUAL error { yyerror("number expected"); } | TOS EQUAL NUMBER { tos=$3; } + | TOS EQUAL ID { if (strcasecmp($3,"IPTOS_LOWDELAY")) { + tos=IPTOS_LOWDELAY; + } else if (strcasecmp($3,"IPTOS_THROUGHPUT")) { + tos=IPTOS_THROUGHPUT; + } else if (strcasecmp($3,"IPTOS_RELIABILITY")) { + tos=IPTOS_RELIABILITY; +#if defined(IPTOS_MINCOST) + } else if (strcasecmp($3,"IPTOS_MINCOST")) { + tos=IPTOS_MINCOST; +#endif +#if defined(IPTOS_LOWCOST) + } else if (strcasecmp($3,"IPTOS_LOWCOST")) { + tos=IPTOS_LOWCOST; +#endif + } else { + yyerror("invalid tos value - allowed: " + "IPTOS_LOWDELAY,IPTOS_THROUGHPUT," + "IPTOS_RELIABILITY" +#if defined(IPTOS_LOWCOST) + ",IPTOS_LOWCOST" +#endif +#if !defined(IPTOS_MINCOST) + ",IPTOS_MINCOST" +#endif + "\n"); + } + } | TOS EQUAL error { yyerror("number expected"); } | PMTU_DISCOVERY EQUAL NUMBER { pmtu_discovery=$3; } | PMTU_DISCOVERY error { yyerror("number expected"); }

1 0

git:master: core: added back the option to use name IDs for tos setting
by Daniel-Constantin Mierla 04 Mar '12

04 Mar '12

Module: sip-router Branch: master Commit: d3eb5d4f21f20a9bc5457642ad5fdcb9e764a02c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d3eb5d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 4 17:22:30 2012 +0100 core: added back the option to use name IDs for tos setting - reported by Olle E. Johansson --- cfg.y | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/cfg.y b/cfg.y index 932b7be..0e684c1 100644 --- a/cfg.y +++ b/cfg.y @@ -111,6 +111,7 @@ #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> +#include <netinet/ip.h> #include <arpa/inet.h> #include <string.h> #include <errno.h> @@ -1622,6 +1623,33 @@ assign_stm: } | MCAST_TTL EQUAL error { yyerror("number expected"); } | TOS EQUAL NUMBER { tos=$3; } + | TOS EQUAL ID { if (strcasecmp($3,"IPTOS_LOWDELAY")) { + tos=IPTOS_LOWDELAY; + } else if (strcasecmp($3,"IPTOS_THROUGHPUT")) { + tos=IPTOS_THROUGHPUT; + } else if (strcasecmp($3,"IPTOS_RELIABILITY")) { + tos=IPTOS_RELIABILITY; +#if defined(IPTOS_MINCOST) + } else if (strcasecmp($3,"IPTOS_MINCOST")) { + tos=IPTOS_MINCOST; +#endif +#if defined(IPTOS_LOWCOST) + } else if (strcasecmp($3,"IPTOS_LOWCOST")) { + tos=IPTOS_LOWCOST; +#endif + } else { + yyerror("invalid tos value - allowed: " + "IPTOS_LOWDELAY,IPTOS_THROUGHPUT," + "IPTOS_RELIABILITY" +#if defined(IPTOS_LOWCOST) + ",IPTOS_LOWCOST" +#endif +#if !defined(IPTOS_MINCOST) + ",IPTOS_MINCOST" +#endif + "\n"); + } + } | TOS EQUAL error { yyerror("number expected"); } | PMTU_DISCOVERY EQUAL NUMBER { pmtu_discovery=$3; } | PMTU_DISCOVERY error { yyerror("number expected"); }

1 0

[tracker] Comment added: uac_replace_to and backup via AVPs (Attachment added)
by sip-router 04 Mar '12

04 Mar '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#198 - uac_replace_to and backup via AVPs User who did this - Jasmin Schnatterbeck (jasmin) ---------- here is the patch for the master branch. I had to change the uac api (for lua) (char* instead of str) in order to avoid another wrapper function - please note, that this part has not been tested yet. Jasmin ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=198#comment503 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task closed: uac_reg.c uac_reg_tm_callback does not support Proxy Authentication (407)
by sip-router 03 Mar '12

03 Mar '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#204 - uac_reg.c uac_reg_tm_callback does not support Proxy Authentication (407) User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Implemented Additional comments about closing: Feature added in master branch. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=204 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: uac_reg.c uac_reg_tm_callback does not support Proxy Authentication (407)
by sip-router 03 Mar '12

03 Mar '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#204 - uac_reg.c uac_reg_tm_callback does not support Proxy Authentication (407) User who did this - Daniel-Constantin Mierla (miconda) ---------- I did a patch for it: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ac96eb… Try it and if does not work, open this issue again. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=204#comment502 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: uac(k): support for 407 challenge to registrations
by Daniel-Constantin Mierla 03 Mar '12

03 Mar '12

Module: sip-router Branch: master Commit: 2ac96ebcc173a2f1e601b38afa5c9bba5de8c0b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ac96eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 3 12:34:38 2012 +0100 uac(k): support for 407 challenge to registrations - requested in FS#204, by Oded Resnik --- modules_k/uac/uac_reg.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/uac/uac_reg.c b/modules_k/uac/uac_reg.c index c25712f..d944a10 100644 --- a/modules_k/uac/uac_reg.c +++ b/modules_k/uac/uac_reg.c @@ -529,7 +529,7 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) } } - if(ps->code == 401) + if(ps->code == 401 || ps->code == 407) { if(ri->flags & UAC_REG_AUTHSENT) { @@ -539,7 +539,7 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) ri->flags |= UAC_REG_DISABLED; goto done; } - hdr = get_autenticate_hdr(ps->rpl, 401); + hdr = get_autenticate_hdr(ps->rpl, ps->code); if (hdr==0) { LM_ERR("failed to extract authenticate hdr\n"); @@ -569,7 +569,7 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) s_ruri.s = b_ruri; s_ruri.len = strlen(s_ruri.s); do_uac_auth(&method, &s_ruri, &cred, &auth, response); - new_auth_hdr=build_authorization_hdr(401, &s_ruri, &cred, + new_auth_hdr=build_authorization_hdr(ps->code, &s_ruri, &cred, &auth, response); if (new_auth_hdr==0) {

1 0

git:master: utils: Update dialog table version from 6 to 7.
by Timo Reimann 02 Mar '12

02 Mar '12

Module: sip-router Branch: master Commit: f554ba1fa7e035a65aa2adc80d25a4560aaf9d3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f554ba1… Author: Timo Reimann <sr(a)foo-lounge.de> Committer: Timo Reimann <sr(a)foo-lounge.de> Date: Fri Mar 2 23:34:05 2012 +0100 utils: Update dialog table version from 6 to 7. --- utils/kamctl/db_sqlite/dialog-create.sql | 2 +- utils/kamctl/mysql/dialog-create.sql | 2 +- utils/kamctl/oracle/dialog-create.sql | 2 +- utils/kamctl/postgres/dialog-create.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/kamctl/db_sqlite/dialog-create.sql b/utils/kamctl/db_sqlite/dialog-create.sql index a75494e..10f6c7a 100644 --- a/utils/kamctl/db_sqlite/dialog-create.sql +++ b/utils/kamctl/db_sqlite/dialog-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('dialog','6'); +INSERT INTO version (table_name, table_version) values ('dialog','7'); CREATE TABLE dialog ( id INTEGER PRIMARY KEY NOT NULL, hash_entry INTEGER NOT NULL, diff --git a/utils/kamctl/mysql/dialog-create.sql b/utils/kamctl/mysql/dialog-create.sql index c2efd36..d4ec70a 100644 --- a/utils/kamctl/mysql/dialog-create.sql +++ b/utils/kamctl/mysql/dialog-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('dialog','6'); +INSERT INTO version (table_name, table_version) values ('dialog','7'); CREATE TABLE dialog ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, hash_entry INT(10) UNSIGNED NOT NULL, diff --git a/utils/kamctl/oracle/dialog-create.sql b/utils/kamctl/oracle/dialog-create.sql index 46795ac..0f6859f 100644 --- a/utils/kamctl/oracle/dialog-create.sql +++ b/utils/kamctl/oracle/dialog-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('dialog','6'); +INSERT INTO version (table_name, table_version) values ('dialog','7'); CREATE TABLE dialog ( id NUMBER(10) PRIMARY KEY, hash_entry NUMBER(10), diff --git a/utils/kamctl/postgres/dialog-create.sql b/utils/kamctl/postgres/dialog-create.sql index ff91313..9955cfb 100644 --- a/utils/kamctl/postgres/dialog-create.sql +++ b/utils/kamctl/postgres/dialog-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('dialog','6'); +INSERT INTO version (table_name, table_version) values ('dialog','7'); CREATE TABLE dialog ( id SERIAL PRIMARY KEY NOT NULL, hash_entry INTEGER NOT NULL,

2 2

git:master: srdb1: Update XML schema for dialog table.
by Timo Reimann 02 Mar '12

02 Mar '12

Module: sip-router Branch: master Commit: adefda18e1c82f9eaf3c83b9a9c39ee89f4025bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=adefda1… Author: Timo Reimann <sr(a)foo-lounge.de> Committer: Timo Reimann <sr(a)foo-lounge.de> Date: Fri Mar 2 23:55:22 2012 +0100 srdb1: Update XML schema for dialog table. - Increase caller and callee CSeq number field length from 7 to 20. - Bump dialog version from 6 to 7. - Regenerate database scripts. --- lib/srdb1/schema/dialog.xml | 6 +++--- utils/kamctl/db_berkeley/kamailio/version | 2 +- utils/kamctl/dbtext/kamailio/version | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/srdb1/schema/dialog.xml b/lib/srdb1/schema/dialog.xml index e8a5527..19bf242 100644 --- a/lib/srdb1/schema/dialog.xml +++ b/lib/srdb1/schema/dialog.xml @@ -9,7 +9,7 @@ <table id="dialog" xmlns:db="http://docbook.org/ns/docbook"> <name>dialog</name> - <version>6</version> + <version>7</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>Persistent dialog information for the dialog module. More @@ -87,14 +87,14 @@ <column> <name>caller_cseq</name> <type>string</type> - <size>7</size> + <size>20</size> <description>Last Cseq number on the caller side.</description> </column> <column> <name>callee_cseq</name> <type>string</type> - <size>7</size> + <size>20</size> <description>Last Cseq number on the caller side.</description> </column> diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 51069f2..56123ba 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -27,7 +27,7 @@ cpl|1 dbaliases| dbaliases|1 dialog| -dialog|6 +dialog|7 dialog_vars| dialog_vars|1 dialplan| diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 0535359..39d6982 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -8,7 +8,7 @@ carrierfailureroute:2 carrierroute:3 cpl:1 dbaliases:1 -dialog:6 +dialog:7 dialog_vars:1 dialplan:1 dispatcher:4

1 0