sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

git:master: modules/sipt/doc: add section headers & fix README file

by Torrey Searle

Module: sip-router Branch: master Commit: 1eeae38650ce70ade73f7e03fd3be78f1d97e0e5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1eeae38… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Sat Apr 6 11:59:55 2013 +0200 modules/sipt/doc: add section headers & fix README file --- modules/sipt/README | 175 ++++++++++++++++++++++++++++++++------- modules/sipt/doc/sipt_admin.xml | 12 ++-- 2 files changed, 150 insertions(+), 37 deletions(-) diff --git a/modules/sipt/README b/modules/sipt/README index 75ea181..31c665b 100644 --- a/modules/sipt/README +++ b/modules/sipt/README @@ -1,31 +1,144 @@ -<?xml version="1.0" encoding='ISO-8859-1'?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" -"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ - - -<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> -%docentities; - -]> - -<book xmlns:xi="http://www.w3.org/2001/XInclude"> - <bookinfo> - <title>sipt Module</title> - <authorgroup> - <author> - <firstname>Torrey</firstname> - <surname>Searle</surname> - <affiliation><orgname>Voxbone SA</orgname></affiliation> - <email>torrey(a)voxbone.com</email> - </author> - </authorgroup> - <copyright> - <year>2013</year> - <holder>Voxbone SA</holder> - </copyright> - </bookinfo> - <toc></toc> - - <xi:include href="sipt_admin.xml"/> - -</book> +sipt Module + +Torrey Searle + + Voxbone SA + <torrey(a)voxbone.com> + + Copyright © 2013 Voxbone SA + __________________________________________________________________ + + Table of Contents + + 1. Admin Guide + + 1. Overview + 2. Dependencies + 3. Functions + + 3.1. sipt_destination(destination, hops, nai) + 3.2. sipt_get_hop_counter() + 3.3. sipt_get_cpc() + 3.4. sipt_get_calling_party_nai() + 3.5. sipt_get_called_party_nai() + + List of Examples + + 1.1. sipt_destination(destination, hops, nai) usage + 1.2. sipt_get_hop_counter() usage + 1.3. sipt_get_cpc() usage + 1.4. sipt_get_calling_party_nai() usage + 1.5. sipt_get_called_party_nai() usage + +Chapter 1. Admin Guide + + Table of Contents + + 1. Overview + 2. Dependencies + 3. Functions + + 3.1. sipt_destination(destination, hops, nai) + 3.2. sipt_get_hop_counter() + 3.3. sipt_get_cpc() + 3.4. sipt_get_calling_party_nai() + 3.5. sipt_get_called_party_nai() + +1. Overview + + Module for updating ISUP encapuslated in SIP (SIP-T/SIP-I) + + The sipt module can be used to update various ss7 headers contained + inside a message. + +2. Dependencies + + The module depends on the following modules (in the other words the + listed modules must be loaded before this module): + * none + +3. Functions + + 3.1. sipt_destination(destination, hops, nai) + 3.2. sipt_get_hop_counter() + 3.3. sipt_get_cpc() + 3.4. sipt_get_calling_party_nai() + 3.5. sipt_get_called_party_nai() + +3.1. sipt_destination(destination, hops, nai) + + updates the IAM in the body if it exists, setting the called party + number to “destination” with the nature address specified in “nai” and + decrementing the hop counter value if present. If the hop counter + header is missing it will be added with the value of “hops”. + + Example 1.1. sipt_destination(destination, hops, nai) usage +... +# update the destination number to our current request uri, +# setting nature of address to international +$rU = "19495551234"; +sipt_destination($rU, 31, 4); +... + +3.2. sipt_get_hop_counter() + + Returns the value of the Hop Counter for the IAM message if it exists. + Returns -1 if there isn't a hop counter. + + Example 1.2. sipt_get_hop_counter() usage +... +# get the hop counter and update the Max-Forwards header if it exists +$avp(s:hop) = sipt_get_hop_counter(); +if($avp(s:hop) > 0) +{ + remove_hf("Max-Forwards"); + append_hf("Max-Forwards: $avp(s:hop)\r\n"); +} + +... + +3.3. sipt_get_cpc() + + Returns the value of the Calling Party Category for the IAM message. + Returns -1 if there is a parsing error. + + Example 1.3. sipt_get_cpc() usage +... +# get the Cpc code and set put it in a custom sip header +$avp(s:cpc) = sipt_get_cpc(); +append_hf("X-CPC: $avp(s:cpc)\r\n"); + +... + +3.4. sipt_get_calling_party_nai() + + Returns the value of the Nature of Address Indicator of the Calling + Party for the IAM message. Returns -1 if there is a parsing error or if + the Calling Party Number is not present. + + Example 1.4. sipt_get_calling_party_nai() usage +... +# get the Calling Nai and add country code if national +$avp(s:from_nai) = sipt_get_calling_party_nai(); +if($avp(s:from_nai) == 3) +{ + $fU = "32" + "$fU"; +} + +... + +3.5. sipt_get_called_party_nai() + + Returns the value of the Nature of Address Indicator of the Called + Party for the IAM message. Returns -1 if there is a parsing error. + + Example 1.5. sipt_get_called_party_nai() usage +... +# get the Called Nai and add country code if national +$avp(s:to_nai) = sipt_get_called_party_nai(); +if($avp(s:to_nai) == 3) +{ + $rU = "32" + "$rU"; +} + +... diff --git a/modules/sipt/doc/sipt_admin.xml b/modules/sipt/doc/sipt_admin.xml index 04b9a59..db52640 100644 --- a/modules/sipt/doc/sipt_admin.xml +++ b/modules/sipt/doc/sipt_admin.xml @@ -37,7 +37,7 @@ <section> <title>Functions</title> - <section> + <section id="sipt.f.sipt_destination"> <title><function moreinfo="none">sipt_destination(destination, hops, nai)</function></title> <para> updates the IAM in the body if it exists, setting the called party number to <quote>destination</quote> @@ -56,7 +56,7 @@ sipt_destination($rU, 31, 4); </programlisting> </example> </section> - <section> + <section id="sipt.f.sipt_get_hop_counter"> <title><function moreinfo="none">sipt_get_hop_counter()</function></title> <para> Returns the value of the Hop Counter for the IAM message if it exists. @@ -78,7 +78,7 @@ if($avp(s:hop) > 0) </programlisting> </example> </section> - <section> + <section id="sipt.f.sipt_get_cpc"> <title><function moreinfo="none">sipt_get_cpc()</function></title> <para> Returns the value of the Calling Party Category for the IAM message. @@ -96,7 +96,7 @@ append_hf("X-CPC: $avp(s:cpc)\r\n"); </programlisting> </example> </section> - <section> + <section id="sipt.f.sipt_get_calling_party_nai"> <title><function moreinfo="none">sipt_get_calling_party_nai()</function></title> <para> Returns the value of the Nature of Address Indicator @@ -119,7 +119,7 @@ if($avp(s:from_nai) == 3) </programlisting> </example> </section> - <section> + <section id="sipt.f.sipt_get_called_party_nai"> <title><function moreinfo="none">sipt_get_called_party_nai()</function></title> <para> Returns the value of the Nature of Address Indicator @@ -132,7 +132,7 @@ if($avp(s:from_nai) == 3) ... # get the Called Nai and add country code if national $avp(s:to_nai) = sipt_get_called_party_nai(); -if($avp(s:from_nai) == 3) +if($avp(s:to_nai) == 3) { $rU = "32" + "$rU"; }

11 years, 8 months

[tracker] Comment added: Added Record Route Header incorrect when Request-URI contains a SIPS URI

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#277 - Added Record Route Header incorrect when Request-URI contains a SIPS URI User who did this - Daniel-Constantin Mierla (miconda) ---------- Thanks, good spot, fixed now in master branch. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=277#comment821 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.

11 years, 8 months

git:master: rr: added missing s in sips for record route

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0ecde91fe6e911997b1f5ee33eb50fa6778b7a89 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ecde91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 5 21:30:06 2013 +0200 rr: added missing s in sips for record route - reported by Sander van Grieken --- modules/rr/record.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/rr/record.c b/modules/rr/record.c index 0779200..41a3245 100644 --- a/modules/rr/record.c +++ b/modules/rr/record.c @@ -47,7 +47,7 @@ #define RR_PREFIX_SIP "Record-Route: <sip:" #define RR_PREFIX_SIP_LEN (sizeof(RR_PREFIX_SIP)-1) -#define RR_PREFIX_SIPS "Record-Route: <sip:" +#define RR_PREFIX_SIPS "Record-Route: <sips:" #define RR_PREFIX_SIPS_LEN (sizeof(RR_PREFIX_SIPS)-1) #define RR_LR ";lr"

11 years, 8 months

git:master: modules/sipcapture: added customization for X-CID header.

by Alexandr Dubovikov

Module: sip-router Branch: master Commit: 6433c3b1c2d84d6a6168e7bdccf9c4f13dc50586 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6433c3b… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Fri Apr 5 21:21:33 2013 +0200 modules/sipcapture: added customization for X-CID header. thanks for the patch goes to Markus Monka <mmonka(a)gmail.com> --- modules/sipcapture/sipcapture.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index a68fb13..0dd855e 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -155,6 +155,7 @@ static str node_column = str_init("node"); static str msg_column = str_init("msg"); static str capture_node = str_init("homer01"); static str star_contact = str_init("*"); +static str callid_aleg_header = str_init("X-CID"); int raw_sock_desc = -1; /* raw socket used for ip packets */ unsigned int raw_sock_children = 1; @@ -277,6 +278,7 @@ static param_export_t params[] = { {"raw_interface", STR_PARAM, &raw_interface.s }, {"promiscious_on", INT_PARAM, &promisc_on }, {"raw_moni_bpf_on", INT_PARAM, &bpf_on }, + {"callid_aleg_header", STR_PARAM, &callid_aleg_header.s}, {0, 0, 0} }; @@ -459,6 +461,7 @@ static int mod_init(void) { node_column.len = strlen(node_column.s); msg_column.len = strlen(msg_column.s); capture_node.len = strlen(capture_node.s); + callid_aleg_header.len = strlen(callid_aleg_header.s); if(raw_socket_listen.s) raw_socket_listen.len = strlen(raw_socket_listen.s); @@ -1158,9 +1161,8 @@ static int sip_capture(struct sip_msg *msg, str *_table) } } - /* get header x-cid: */ - /* callid_aleg X-CID */ - if((tmphdr[0] = get_hdr_by_name(msg,"X-CID", 5)) != NULL) { + /* callid_aleg - default is X-CID but configurable via modul params */ + if((tmphdr[0] = get_hdr_by_name(msg, callid_aleg_header.s, callid_aleg_header.len)) != NULL) { sco.callid_aleg = tmphdr[0]->body; } else { EMPTY_STR(sco.callid_aleg);}

11 years, 8 months

git:master: modules/sipcapture: fixed ERR message for HEPv3,

by Alexandr Dubovikov

Module: sip-router Branch: master Commit: 19c8f0eaac2b77f06f2842d3a7d481268afa096a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=19c8f0e… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Fri Apr 5 21:10:57 2013 +0200 modules/sipcapture: fixed ERR message for HEPv3, added table param for sip_capture() function --- modules/sipcapture/hep.c | 4 +- modules/sipcapture/sipcapture.c | 43 ++++++++++++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/modules/sipcapture/hep.c b/modules/sipcapture/hep.c index a5162c7..31ad30a 100644 --- a/modules/sipcapture/hep.c +++ b/modules/sipcapture/hep.c @@ -228,7 +228,7 @@ int hepv2_received(char *buf, unsigned int len, struct receive_info *ri){ */ int hepv3_received(char *buf, unsigned int len, struct receive_info *ri) { - if(parsing_hepv3_message(buf, len)) { + if(!parsing_hepv3_message(buf, len)) { LM_ERR("couldn't parse hepv3 message\n"); return -2; } @@ -396,7 +396,7 @@ int parsing_hepv3_message(char *buf, unsigned int len) { hg->capt_id = (hep_chunk_uint32_t *) (tmp); i+=chunk_length; heptime->captid = ntohs(hg->capt_id->data); - LM_ERR("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX: [%i] vs [%i]\n", heptime->captid, ntohl(hg->capt_id->data)); + //LM_ERR("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX: [%i] vs [%i]\n", heptime->captid, ntohl(hg->capt_id->data)); totelem++; break; diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index fdc286c..a68fb13 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -74,6 +74,7 @@ #include "../../onsend.h" #include "../../resolve.h" #include "../../receive.h" +#include "../../mod_fix.h" #include "sipcapture.h" #include "hash_mode.h" #include "hep.h" @@ -99,7 +100,9 @@ static int mod_init(void); static int sipcapture_init_rpc(void); static int child_init(int rank); static void destroy(void); -static int sip_capture(struct sip_msg *msg, char *s1, char *s2); +static int sipcapture_fixup(void** param, int param_no); +static int sip_capture(struct sip_msg *msg, str *dtable); +static int w_sip_capture(struct sip_msg* _m, char* _table, char* s2); int init_rawsock_children(void); int extract_host_port(void); int raw_capture_socket(struct ip_addr* ip, str* iface, int port_start, int port_end, int proto); @@ -212,7 +215,8 @@ struct hep_timehdr* heptime; * Exported functions */ static cmd_export_t cmds[] = { - {"sip_capture", (cmd_function)sip_capture, 0, 0, 0, ANY_ROUTE}, + {"sip_capture", (cmd_function)w_sip_capture, 0, 0, 0, ANY_ROUTE}, + {"sip_capture", (cmd_function)w_sip_capture, 1, sipcapture_fixup, 0, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} }; @@ -579,6 +583,29 @@ error: #endif } +static int sipcapture_fixup(void** param, int param_no) +{ + if (param_no == 1) { + return fixup_var_pve_str_12(param, 1); + } + + return 0; +} + +static int w_sip_capture(struct sip_msg* _m, char* _table, char* s2) +{ + str table = {0}; + + if(_table!=NULL && (get_str_fparam(&table, _m, (fparam_t*)_table) < 0)) + { + LM_ERR("invalid table parameter [%s] [%s]\n", _table, table.s); + return -1; + } + + return sip_capture(_m, (table.len>0)?&table:NULL); +} + + int extract_host_port(void) { if(raw_socket_listen.len) { @@ -699,7 +726,7 @@ static int sip_capture_prepare(sip_msg_t *msg) return 0; } -static int sip_capture_store(struct _sipcapture_object *sco) +static int sip_capture_store(struct _sipcapture_object *sco, str *dtable) { db_key_t db_keys[NR_KEYS]; db_val_t db_vals[NR_KEYS]; @@ -928,8 +955,10 @@ static int sip_capture_store(struct _sipcapture_object *sco) LM_DBG("round robin idx is:%d\n", ii); } } - LM_DBG("insert into homer table: [%.*s]\n", table_names[ii].len, table_names[ii].s); - db_funcs.use_table(db_con, &table_names[ii]); + + /* check dynamic table */ + LM_DBG("insert into homer table: [%.*s]\n", (dtable)?dtable->len:table_names[ii].len, (dtable)?dtable->s:table_names[ii].s); + db_funcs.use_table(db_con, (dtable)?dtable:&table_names[ii]); LM_DBG("storing info...\n"); @@ -953,7 +982,7 @@ error: return -1; } -static int sip_capture(struct sip_msg *msg, char *s1, char *s2) +static int sip_capture(struct sip_msg *msg, str *_table) { struct _sipcapture_object sco; struct sip_uri from, to, contact; @@ -1262,7 +1291,7 @@ static int sip_capture(struct sip_msg *msg, char *s1, char *s2) } #endif //LM_DBG("DONE"); - return sip_capture_store(&sco); + return sip_capture_store(&sco, _table); } #define capture_is_off(_msg) \

11 years, 8 months

git:master: modules/sipt: added some additional getter methods

by Torrey Searle

Module: sip-router Branch: master Commit: 59b9208700e578df5000f8ad732c2e444712b0fa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59b9208… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Fri Apr 5 18:38:36 2013 +0200 modules/sipt: added some additional getter methods new functions: sipt_get_cpc() sipt_get_calling_party_nai() sipt_get_called_party_nai() --- modules/sipt/doc/sipt_admin.xml | 63 ++++++++++++++++++++++++++++++ modules/sipt/sipt.c | 81 +++++++++++++++++++++++++++++++++++++++ modules/sipt/ss7.h | 15 +++++++ modules/sipt/ss7_parser.c | 78 ++++++++++++++++++++++++++----------- 4 files changed, 214 insertions(+), 23 deletions(-) diff --git a/modules/sipt/doc/sipt_admin.xml b/modules/sipt/doc/sipt_admin.xml index d8e9fdd..04b9a59 100644 --- a/modules/sipt/doc/sipt_admin.xml +++ b/modules/sipt/doc/sipt_admin.xml @@ -78,6 +78,69 @@ if($avp(s:hop) > 0) </programlisting> </example> </section> + <section> + <title><function moreinfo="none">sipt_get_cpc()</function></title> + <para> + Returns the value of the Calling Party Category for the IAM message. + Returns -1 if there is a parsing error. + </para> + <example> + <title><function moreinfo="none">sipt_get_cpc()</function> usage</title> + <programlisting format="linespecific"> +... +# get the Cpc code and set put it in a custom sip header +$avp(s:cpc) = sipt_get_cpc(); +append_hf("X-CPC: $avp(s:cpc)\r\n"); + +... +</programlisting> + </example> + </section> + <section> + <title><function moreinfo="none">sipt_get_calling_party_nai()</function></title> + <para> + Returns the value of the Nature of Address Indicator + of the Calling Party for the IAM message. + Returns -1 if there is a parsing error or if + the Calling Party Number is not present. + </para> + <example> + <title><function moreinfo="none">sipt_get_calling_party_nai()</function> usage</title> + <programlisting format="linespecific"> +... +# get the Calling Nai and add country code if national +$avp(s:from_nai) = sipt_get_calling_party_nai(); +if($avp(s:from_nai) == 3) +{ + $fU = "32" + "$fU"; +} + +... +</programlisting> + </example> + </section> + <section> + <title><function moreinfo="none">sipt_get_called_party_nai()</function></title> + <para> + Returns the value of the Nature of Address Indicator + of the Called Party for the IAM message. + Returns -1 if there is a parsing error. + </para> + <example> + <title><function moreinfo="none">sipt_get_called_party_nai()</function> usage</title> + <programlisting format="linespecific"> +... +# get the Called Nai and add country code if national +$avp(s:to_nai) = sipt_get_called_party_nai(); +if($avp(s:from_nai) == 3) +{ + $rU = "32" + "$rU"; +} + +... +</programlisting> + </example> + </section> </section> </chapter> diff --git a/modules/sipt/sipt.c b/modules/sipt/sipt.c index 7e9e266..8b64b43 100644 --- a/modules/sipt/sipt.c +++ b/modules/sipt/sipt.c @@ -41,6 +41,9 @@ MODULE_VERSION static int sipt_destination(struct sip_msg *msg, char *_destination, char *_hops, char * _nai); static int sipt_get_hop_counter(struct sip_msg *msg, char *x, char *y); +static int sipt_get_cpc(struct sip_msg *msg, char *x, char *y); +static int sipt_get_calling_party_nai(struct sip_msg *msg, char *x, char *y); +static int sipt_get_called_party_nai(struct sip_msg *msg, char *x, char *y); static int mod_init(void); static void mod_destroy(void); @@ -79,6 +82,24 @@ static cmd_export_t cmds[]={ 0, 0, /* */ /* can be applied to original requests */ REQUEST_ROUTE|BRANCH_ROUTE}, + {"sipt_get_cpc", /* action name as in scripts */ + (cmd_function)sipt_get_cpc, /* C function name */ + 0, /* number of parameters */ + 0, 0, /* */ + /* can be applied to original requests */ + REQUEST_ROUTE|BRANCH_ROUTE}, + {"sipt_get_calling_party_nai", /* action name as in scripts */ + (cmd_function)sipt_get_calling_party_nai, /* C function name */ + 0, /* number of parameters */ + 0, 0, /* */ + /* can be applied to original requests */ + REQUEST_ROUTE|BRANCH_ROUTE}, + {"sipt_get_called_party_nai", /* action name as in scripts */ + (cmd_function)sipt_get_called_party_nai, /* C function name */ + 0, /* number of parameters */ + 0, 0, /* */ + /* can be applied to original requests */ + REQUEST_ROUTE|BRANCH_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -278,6 +299,66 @@ static int sipt_get_hop_counter(struct sip_msg *msg, char *x, char *y) return isup_get_hop_counter((unsigned char*)body.s, body.len); } +static int sipt_get_cpc(struct sip_msg *msg, char *x, char *y) +{ + str body; + body.s = get_body_part(msg, TYPE_APPLICATION,SUBTYPE_UNKNOWN,&body.len); + + if(body.s == NULL) + { + LM_ERR("No ISUP Message Found"); + return -1; + } + + if(body.s[0] != ISUP_IAM) + { + LM_DBG("message not an IAM\n"); + return -1; + } + + return isup_get_cpc((unsigned char*)body.s, body.len); +} + +static int sipt_get_calling_party_nai(struct sip_msg *msg, char *x, char *y) +{ + str body; + body.s = get_body_part(msg, TYPE_APPLICATION,SUBTYPE_UNKNOWN,&body.len); + + if(body.s == NULL) + { + LM_ERR("No ISUP Message Found"); + return -1; + } + + if(body.s[0] != ISUP_IAM) + { + LM_DBG("message not an IAM\n"); + return -1; + } + + return isup_get_calling_party_nai((unsigned char*)body.s, body.len); +} + +static int sipt_get_called_party_nai(struct sip_msg *msg, char *x, char *y) +{ + str body; + body.s = get_body_part(msg, TYPE_APPLICATION,SUBTYPE_UNKNOWN,&body.len); + + if(body.s == NULL) + { + LM_ERR("No ISUP Message Found"); + return -1; + } + + if(body.s[0] != ISUP_IAM) + { + LM_DBG("message not an IAM\n"); + return -1; + } + + return isup_get_called_party_nai((unsigned char*)body.s, body.len); +} + static int sipt_destination(struct sip_msg *msg, char *_destination, char *_hops, char * _nai) { str * str_hops = (str*)_hops; diff --git a/modules/sipt/ss7.h b/modules/sipt/ss7.h index 2599b80..4fe2bfb 100644 --- a/modules/sipt/ss7.h +++ b/modules/sipt/ss7.h @@ -148,7 +148,22 @@ struct isup_parm_opt { unsigned char data[0]; }; + +struct isup_iam_fixed { + unsigned char type; + unsigned char nature_of_connection; + unsigned char forward_call_indicators[2]; + unsigned char calling_party_category; + unsigned char transmission_medium_req; + unsigned char fixed_pointer; + unsigned char optional_pointer; + unsigned char called_party_number[0]; +}; + int isup_get_hop_counter(unsigned char *buf, int len); +int isup_get_cpc(unsigned char *buf, int len); +int isup_get_calling_party_nai(unsigned char *buf, int len); +int isup_get_called_party_nai(unsigned char *buf, int len); int isup_update_destination(char * dest, int hops, int nai, unsigned char *buf, int len, unsigned char * obuf, int olen); #endif diff --git a/modules/sipt/ss7_parser.c b/modules/sipt/ss7_parser.c index a960212..b4dce39 100644 --- a/modules/sipt/ss7_parser.c +++ b/modules/sipt/ss7_parser.c @@ -26,6 +26,7 @@ #include "ss7.h" #include <string.h> +#include <stddef.h> static char char2digit(char localchar) { @@ -117,46 +118,30 @@ static int encode_called_party(char * number, unsigned char * flags, int nai, un // returns start of specified optional header of IAM, otherwise return -1 static int get_optional_header(unsigned char header, unsigned char *buf, int len) { + struct isup_iam_fixed * message = (struct isup_iam_fixed*)buf; int offset = 0; int res; - char optparams; // not an iam? do nothing - if(buf[0] != ISUP_IAM) + if(message->type != ISUP_IAM) { return -1; } - /* Copy the fixed parms */ - len -= 6; - offset += 6; + len -= offsetof(struct isup_iam_fixed, optional_pointer); + offset += offsetof(struct isup_iam_fixed, optional_pointer); if (len < 1) return -1; - /* IAM has one Fixed variable param, Called party number */ - - // pointer to fixed part (2) - offset++; - len--; - - - //pointer to optional part - optparams = buf[offset]; - offset++; - len--; - - - // add the new mandatory fixed header - res = buf[offset]; - offset += res+1; - len -= res+1; + offset += message->optional_pointer; + len -= message->optional_pointer; if (len < 1 ) return -1; /* Optional paramter parsing code */ - if (optparams) { + if (message->optional_pointer) { while ((len > 0) && (buf[offset] != 0)) { struct isup_parm_opt *optparm = (struct isup_parm_opt *)(buf + offset); @@ -184,7 +169,54 @@ int isup_get_hop_counter(unsigned char *buf, int len) return -1; } +int isup_get_cpc(unsigned char *buf, int len) +{ + struct isup_iam_fixed * message = (struct isup_iam_fixed*)buf; + + // not an iam? do nothing + if(message->type != ISUP_IAM) + { + return -1; + } + /* Message Type = 1 */ + len -= offsetof(struct isup_iam_fixed, calling_party_category); + + if (len < 1) + return -1; + + return (int)message->calling_party_category; +} + + +int isup_get_calling_party_nai(unsigned char *buf, int len) +{ + int offset = get_optional_header(ISUP_PARM_CALLING_PARTY_NUM, buf, len); + + if(offset != -1 && len-offset-2 > 0) + { + return buf[offset+2] & 0x7F; + } + return -1; +} + +int isup_get_called_party_nai(unsigned char *buf, int len) +{ + struct isup_iam_fixed * message = (struct isup_iam_fixed*)buf; + + // not an iam? do nothing + if(message->type != ISUP_IAM) + { + return -1; + } + + /* Message Type = 1 */ + len -= offsetof(struct isup_iam_fixed, called_party_number); + + if (len < 1) + return -1; + return message->called_party_number[1]&0x7F; +} int isup_update_destination(char * dest, int hops, int nai, unsigned char *buf, int len, unsigned char * obuf, int olen) {

11 years, 8 months

git:master: modules/sipt: updated README

by Torrey Searle

Module: sip-router Branch: master Commit: d992e4dc8742807f71645f385d68d60b90746fb3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d992e4d… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Fri Apr 5 18:43:06 2013 +0200 modules/sipt: updated README --- modules/sipt/README | 117 +++++++++++++------------------------------------- 1 files changed, 31 insertions(+), 86 deletions(-) diff --git a/modules/sipt/README b/modules/sipt/README index f655523..75ea181 100644 --- a/modules/sipt/README +++ b/modules/sipt/README @@ -1,86 +1,31 @@ -sipt Module - -Torrey Searle - - Voxbone SA - <torrey(a)voxbone.com> - - Copyright © 2013 Voxbone SA - __________________________________________________________________ - - Table of Contents - - 1. Admin Guide - - 1. Overview - 2. Dependencies - 3. Functions - - 3.1. sipt_destination(destination, hops, nai) - 3.2. sipt_get_hop_counter() - - List of Examples - - 1.1. sipt_destination(destination, hops, nai) usage - 1.2. sipt_get_hop_counter() usage - -Chapter 1. Admin Guide - - Table of Contents - - 1. Overview - 2. Dependencies - 3. Functions - - 3.1. sipt_destination(destination, hops, nai) - 3.2. sipt_get_hop_counter() - -1. Overview - - Module for updating ISUP encapuslated in SIP (SIP-T/SIP-I) - - The sipt module can be used to update various ss7 headers contained - inside a message. - -2. Dependencies - - The module depends on the following modules (in the other words the - listed modules must be loaded before this module): - * none - -3. Functions - - 3.1. sipt_destination(destination, hops, nai) - 3.2. sipt_get_hop_counter() - -3.1. sipt_destination(destination, hops, nai) - - updates the IAM in the body if it exists, setting the called party - number to “destination” with the nature address specified in “nai” and - decrementing the hop counter value if present. If the hop counter - header is missing it will be added with the value of “hops”. - - Example 1.1. sipt_destination(destination, hops, nai) usage -... -# update the destination number to our current request uri, -# setting nature of address to international -$rU = "19495551234"; -sipt_destination($rU, 31, 4); -... - -3.2. sipt_get_hop_counter() - - Returns the value of the Hop Counter for the IAM message if it exists. - Returns -1 if there isn't a hop counter. - - Example 1.2. sipt_get_hop_counter() usage -... -# get the hop counter and update the Max-Forwards header if it exists -$avp(s:hop) = sipt_get_hop_counter(); -if($avp(s:hop) > 0) -{ - remove_hf("Max-Forwards"); - append_hf("Max-Forwards: $avp(s:hop)\r\n"); -} - -... +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ + + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + +<book xmlns:xi="http://www.w3.org/2001/XInclude"> + <bookinfo> + <title>sipt Module</title> + <authorgroup> + <author> + <firstname>Torrey</firstname> + <surname>Searle</surname> + <affiliation><orgname>Voxbone SA</orgname></affiliation> + <email>torrey(a)voxbone.com</email> + </author> + </authorgroup> + <copyright> + <year>2013</year> + <holder>Voxbone SA</holder> + </copyright> + </bookinfo> + <toc></toc> + + <xi:include href="sipt_admin.xml"/> + +</book>

11 years, 8 months

[tracker] Comment added: Added Record Route Header incorrect when Request-URI contains a SIPS URI

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#277 - Added Record Route Header incorrect when Request-URI contains a SIPS URI User who did this - Sander van Grieken (accumulator) ---------- #define RR_PREFIX_SIPS is missing an 's', so it still creates sip: URIs :) ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=277#comment820 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.

11 years, 8 months

git:master: modules/websocket: Update README xml with section IDs

by Hugh Waite

Module: sip-router Branch: master Commit: 38053da7b5951b13be413aac61f89ad418aba99e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=38053da… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Fri Apr 5 14:12:22 2013 +0100 modules/websocket: Update README xml with section IDs --- modules/websocket/README | 111 +++++++++++++++------------- modules/websocket/doc/websocket_admin.xml | 39 ++++++----- 2 files changed, 80 insertions(+), 70 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=380…

11 years, 8 months

git:master: modules/websocket: re-added declaration of ws_keepalive_mechanism to ws_frame.c

by Peter Dunkley

Module: sip-router Branch: master Commit: 8def957134e6068c14d2180d8497c6eb1f2a6cc5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8def957… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Apr 5 13:35:51 2013 +0100 modules/websocket: re-added declaration of ws_keepalive_mechanism to ws_frame.c - Accidentally removed when configuration framework stuff was added. --- modules/websocket/ws_frame.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index d1f8d6c..b6be135 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -94,6 +94,7 @@ typedef enum #define OPCODE_PONG (0xa) /* 0xb - 0xf are reserved for further control frames */ +int ws_keepalive_mechanism = DEFAULT_KEEPALIVE_MECHANISM; str ws_ping_application_data = {0, 0}; stat_var *ws_failed_connections;

11 years, 8 months

← Newer
1
...
29
30
31
32
33
34
35
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013