sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

git:master: Makefile.groups: Updated package group for app_java.

by Konstantin Mosesov

Module: sip-router Branch: master Commit: 289bc2399c09f5f449fd835f9a046597e4f2b38f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=289bc23… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Wed Mar 13 22:29:20 2013 +0200 Makefile.groups: Updated package group for app_java. --- Makefile.groups | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/Makefile.groups b/Makefile.groups index aa41e71..161e3e0 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -139,6 +139,9 @@ mod_list_ims=cdp cdp_avp dialog_ng ims_auth ims_isc ims_icscf ims_qos \ # - modules depending on osp toolkit library mod_list_osp=osp +# - modules depending on java library +mod_list_java=app_java + # - modules depending on iptables library mod_list_iptrtpproxy=iptrtpproxy @@ -161,7 +164,8 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_mono) $(mod_list_ims) \ $(mod_list_cassandra) $(mod_list_oracle) \ $(mod_list_iptrtpproxy) $(mod_list_mi_xmlrpc) \ - $(mod_list_outbound) $(mod_list_osp) ) + $(mod_list_outbound) $(mod_list_osp) \ + $(mod_list_java) ) @@ -307,6 +311,8 @@ module_group_kims=$(mod_list_ims) # pkg outbound module module_group_koutbound=$(mod_list_outbound) +# pkg java module +module_group_kjava=$(mod_list_java) # list of static modules #

11 years, 7 months

git:pd/outbound: Merge branch 'master' into outbound

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 9a4afeecf8d1166533fefd4df2afc850a44c9ec3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a4afee… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Mar 13 16:57:11 2013 +0000 Merge branch 'master' into outbound * master: (68 commits) modules/permissions: DNS domain names in address table modules/app_java - New module app_java: Java Native Interface support. nathelper: Decrease ambiguity by renaming sipping_disable_bflag to natping_disable_bflag registrar: New set_q_override function parser,modules/pv,modules/sipcapture: Improved parsing of P-Asserted/Preferred-Identity headers Makefile.dirs: updated the list with module directories NEWS Update with reference to Wiki INSTALL update for release README - last minute small edits tm: set proper buffer len when Max-Forward header is not added core: try to detect ipv6 addresses only when USE_IPV6 is used pkg: deb specs updated for v4.0.0 INSTALL: updates for v4.0.0 ChangeLog_k: removed obsolete file ChangeLog: updated content to prepare for v4.0.0 sca: fix regression dropping Expires header from SUBSCRIBE replies. sca: move SUBSCRIBE response handling to sca_subscription_reply sca: reject out-of-dialog attempts to seize privately held call. sca: make sca_reply a generic reply function. pkg/kamailio/(centos|fedora): added docbook2X build requirement ... Conflicts: modules/registrar/save.h ---

11 years, 7 months

git:master: modules/permissions: DNS domain names in address table

by Anca Vamanu

Module: sip-router Branch: master Commit: 7d46ff0e5487d9e925c78a57fd7ee036858f0c15 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d46ff0… Author: avamanu <avamanu(a)avamanu.(none)> Committer: avamanu <avamanu(a)avamanu.(none)> Date: Wed Mar 13 17:49:21 2013 +0200 modules/permissions: DNS domain names in address table Added the possibility to check also against DNS domain names with allow_address() function. Now in the address table one group can have exact IPs, subnet IPs and DNS domain names. --- modules/permissions/README | 115 ++++++++------ modules/permissions/address.c | 169 ++++++++++++++------ modules/permissions/address.h | 3 + modules/permissions/doc/permissions_admin.xml | 36 +++- modules/permissions/hash.c | 217 +++++++++++++++++++++++++ modules/permissions/hash.h | 54 ++++++ modules/permissions/mi.c | 32 ++++ modules/permissions/mi.h | 4 + modules/permissions/permissions.c | 8 + 9 files changed, 529 insertions(+), 109 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7d4…

11 years, 7 months

git:jason.penton/ims_ro_interface: modules/ims_ro: restored lost code in previous commit. full working prototype now

by Jason Penton

Module: sip-router Branch: jason.penton/ims_ro_interface Commit: 3422dc64cee959b5af26cdc589b34eec9efef5ef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3422dc6… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Wed Mar 13 12:40:04 2013 +0200 modules/ims_ro: restored lost code in previous commit. full working prototype now --- modules/ims_ro/ccr.c | 2 +- modules/ims_ro/defines.h | 28 +++ modules/ims_ro/dialog.c | 75 ++++++++ modules/ims_ro/dialog.h | 14 ++ modules/ims_ro/ims_ro.c | 354 ++++++++++++++++++++------------------ modules/ims_ro/ims_ro.h | 2 +- modules/ims_ro/mod.c | 196 ++++++++------------- modules/ims_ro/ro_avp.c | 117 +++++++++++++ modules/ims_ro/ro_avp.h | 26 +++ modules/ims_ro/ro_session.c | 81 --------- modules/ims_ro/ro_session.h | 66 ------- modules/ims_ro/ro_session_hash.c | 69 +++++++- modules/ims_ro/ro_session_hash.h | 69 +------- 13 files changed, 590 insertions(+), 509 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=342…

11 years, 7 months

solving nat pinging hassle

by Juha Heinanen

usrloc has this var: 3.1. nat_bflag (integer) The index of the branch flag to be used as NAT marker (if the contact is or not natted). This is a branch flag and it will be imported and used by all other modules depending of usrloc module. it is a fine flag telling that a particular contact is behind nat, but it does not tell if that particular contact should be nat pinged. nathelper has this var: 4.3. ping_nated_only (integer) If this variable is set then only contacts that have "behind_NAT" flag in user location database set will get ping. that is not a good var, because not contacts that are behind nat (e.g. ones that use tcp or outbound) need to be pinged. now in master a new nathelper var was introduced (i guess for solving the above problem): 4.10. natping_disable_bflag (integer) What branch flag should be used by the module to disable NAT pings on a per-registration basis. If the given flag is set for a particular registration, then no NAT pings will be sent at all, regardless of any other conditions. i my opinion this solution is not good, because it complicates the decision process by requiring that two flags need to be checked in order to determine if a contact should be nat pinged. i would have liked to solve this problem by introducing a new nathelper var "nat ping this contact bflag" that tells which bflag to check when deciding if a contact should be nat pinged. that bflag would then be set before registrar save() is called in addition to setting the "behind nat" bflag. in my opinion there should have been discussion on this list before the natping_disable_bflag was introduced. also, for the benefit of db only usrloc, i would like to add a new "nat ping" column to location table, which tells if the contact should be nat pinged and if so how the pinging should be done. comments or should i just go ahead with the plan? -- juha

11 years, 7 months

git:master: nathelper: Decrease ambiguity by renaming sipping_disable_bflag to natping_disable_bflag

by Richard Fuchs

Module: sip-router Branch: master Commit: 93b2b3ba7951bc84a208fb296b3c7b4e52516389 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=93b2b3b… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Tue Mar 12 09:43:57 2013 -0400 nathelper: Decrease ambiguity by renaming sipping_disable_bflag to natping_disable_bflag --- modules/nathelper/README | 60 ++++++++++++++-------------- modules/nathelper/doc/nathelper_admin.xml | 44 ++++++++++---------- modules/nathelper/nathelper.c | 8 ++-- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/modules/nathelper/README b/modules/nathelper/README index 6328cb8..da8523b 100644 --- a/modules/nathelper/README +++ b/modules/nathelper/README @@ -53,9 +53,9 @@ Ovidiu Sas 4.5. natping_socket (string) 4.6. received_avp (str) 4.7. sipping_bflag (integer) - 4.8. sipping_disable_bflag (integer) - 4.9. sipping_from (string) - 4.10. sipping_method (string) + 4.8. sipping_from (string) + 4.9. sipping_method (string) + 4.10. natping_disable_bflag (integer) 4.11. nortpproxy_str (string) 4.12. keepalive_timeout (int) @@ -94,9 +94,9 @@ Ovidiu Sas 1.5. Set natping_socket parameter 1.6. Set received_avp parameter 1.7. Set sipping_bflag parameter - 1.8. Set sipping_disable_bflag parameter - 1.9. Set sipping_from parameter - 1.10. Set sipping_method parameter + 1.8. Set sipping_from parameter + 1.9. Set sipping_method parameter + 1.10. Set natping_disable_bflag parameter 1.11. Set nortpproxy_str parameter 1.12. Set keepalive_timeout parameter 1.13. fix_nated_contact usage @@ -130,9 +130,9 @@ Chapter 1. Admin Guide 4.5. natping_socket (string) 4.6. received_avp (str) 4.7. sipping_bflag (integer) - 4.8. sipping_disable_bflag (integer) - 4.9. sipping_from (string) - 4.10. sipping_method (string) + 4.8. sipping_from (string) + 4.9. sipping_method (string) + 4.10. natping_disable_bflag (integer) 4.11. nortpproxy_str (string) 4.12. keepalive_timeout (int) @@ -229,9 +229,9 @@ Chapter 1. Admin Guide 4.5. natping_socket (string) 4.6. received_avp (str) 4.7. sipping_bflag (integer) - 4.8. sipping_disable_bflag (integer) - 4.9. sipping_from (string) - 4.10. sipping_method (string) + 4.8. sipping_from (string) + 4.9. sipping_method (string) + 4.10. natping_disable_bflag (integer) 4.11. nortpproxy_str (string) 4.12. keepalive_timeout (int) @@ -335,21 +335,7 @@ modparam("nathelper", "received_avp", "$avp(i:42)") modparam("nathelper", "sipping_bflag", 7) ... -4.8. sipping_disable_bflag (integer) - - What branch flag should be used by the module to disable NAT pings on a - per-registration basis. If the given flag is set for a particular - registration, then no NAT pings will be sent at all, regardless of any - other conditions. - - Default value is -1 (disabled). - - Example 1.8. Set sipping_disable_bflag parameter -... -modparam("nathelper", "sipping_disable_bflag", 8) -... - -4.9. sipping_from (string) +4.8. sipping_from (string) The parameter sets the SIP URI to be used in generating the SIP requests for NAT ping purposes. To enable the SIP request pinging @@ -358,23 +344,37 @@ modparam("nathelper", "sipping_disable_bflag", 8) Default value is “NULL”. - Example 1.9. Set sipping_from parameter + Example 1.8. Set sipping_from parameter ... modparam("nathelper", "sipping_from", "sip:pinger@siphub.net") ... -4.10. sipping_method (string) +4.9. sipping_method (string) The parameter sets the SIP method to be used in generating the SIP requests for NAT ping purposes. Default value is “OPTIONS”. - Example 1.10. Set sipping_method parameter + Example 1.9. Set sipping_method parameter ... modparam("nathelper", "sipping_method", "INFO") ... +4.10. natping_disable_bflag (integer) + + What branch flag should be used by the module to disable NAT pings on a + per-registration basis. If the given flag is set for a particular + registration, then no NAT pings will be sent at all, regardless of any + other conditions. + + Default value is -1 (disabled). + + Example 1.10. Set natping_disable_bflag parameter +... +modparam("nathelper", "natping_disable_bflag", 8) +... + 4.11. nortpproxy_str (string) The parameter sets the SDP attribute used by nathelper to mark the diff --git a/modules/nathelper/doc/nathelper_admin.xml b/modules/nathelper/doc/nathelper_admin.xml index 642bf63..e052eb9 100644 --- a/modules/nathelper/doc/nathelper_admin.xml +++ b/modules/nathelper/doc/nathelper_admin.xml @@ -286,28 +286,6 @@ modparam("nathelper", "sipping_bflag", 7) </example> </section> <section> - <title><varname>sipping_disable_bflag</varname> (integer)</title> - <para> - What branch flag should be used by the module to disable NAT pings - on a per-registration basis. If the given flag is set for a - particular registration, then no NAT pings will be sent at all, - regardless of any other conditions. - </para> - <para> - <emphasis> - Default value is -1 (disabled). - </emphasis> - </para> - <example> - <title>Set <varname>sipping_disable_bflag</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("nathelper", "sipping_disable_bflag", 8) -... -</programlisting> - </example> - </section> - <section> <title><varname>sipping_from</varname> (string)</title> <para> The parameter sets the SIP URI to be used in generating the SIP @@ -350,6 +328,28 @@ modparam("nathelper", "sipping_method", "INFO") </example> </section> <section> + <title><varname>natping_disable_bflag</varname> (integer)</title> + <para> + What branch flag should be used by the module to disable NAT pings + on a per-registration basis. If the given flag is set for a + particular registration, then no NAT pings will be sent at all, + regardless of any other conditions. + </para> + <para> + <emphasis> + Default value is -1 (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>natping_disable_bflag</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("nathelper", "natping_disable_bflag", 8) +... +</programlisting> + </example> + </section> + <section> <title><varname>nortpproxy_str</varname> (string)</title> <para> The parameter sets the SDP attribute used by nathelper to mark diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c index b170ecc..0c1c677 100644 --- a/modules/nathelper/nathelper.c +++ b/modules/nathelper/nathelper.c @@ -339,7 +339,7 @@ static const char sbuf[4] = {0, 0, 0, 0}; static char *force_socket_str = 0; static pid_t mypid; static int sipping_flag = -1; -static int sipping_disable_flag = -1; +static int natping_disable_flag = -1; static int natping_processes = 1; static str nortpproxy_str = str_init("a=nortpproxy:yes"); @@ -413,7 +413,7 @@ static param_export_t params[] = { {"sipping_from", STR_PARAM, &sipping_from.s }, {"sipping_method", STR_PARAM, &sipping_method.s }, {"sipping_bflag", INT_PARAM, &sipping_flag }, - {"sipping_disable_bflag", INT_PARAM, &sipping_disable_flag }, + {"natping_disable_bflag", INT_PARAM, &natping_disable_flag }, {"natping_processes", INT_PARAM, &natping_processes }, {"natping_socket", STR_PARAM, &natping_socket }, {"keepalive_timeout", INT_PARAM, &nh_keepalive_timeout }, @@ -678,7 +678,7 @@ mod_init(void) } sipping_flag = (sipping_flag==-1)?0:(1<<sipping_flag); - sipping_disable_flag = (sipping_disable_flag==-1)?0:(1<<sipping_disable_flag); + natping_disable_flag = (natping_disable_flag==-1)?0:(1<<natping_disable_flag); /* set reply function if SIP natping is enabled */ if (sipping_flag) { @@ -1997,7 +1997,7 @@ nh_timer(unsigned int ticks, void *timer_idx) memcpy( &aorhash, cp, sizeof(aorhash)); cp = (char*)cp + sizeof(aorhash); - if ((flags & sipping_disable_flag)) /* always 0 if sipping_disable_flag not set */ + if ((flags & natping_disable_flag)) /* always 0 if natping_disable_flag not set */ continue; /* determin the destination */

11 years, 7 months

git:jason.penton/ims_ro_interface: lib/ims: added function to get p-charging-vector

by Jason Penton

Module: sip-router Branch: jason.penton/ims_ro_interface Commit: 9e7dd6ffd0467e7c1f8f60ea20204e87b472bd14 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e7dd6f… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Mar 12 13:20:34 2013 +0200 lib/ims: added function to get p-charging-vector --- lib/ims/ims_getters.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/ims/ims_getters.h | 16 +++++++ 2 files changed, 135 insertions(+), 0 deletions(-) diff --git a/lib/ims/ims_getters.c b/lib/ims/ims_getters.c index d1c84c7..94efe20 100644 --- a/lib/ims/ims_getters.c +++ b/lib/ims/ims_getters.c @@ -1399,3 +1399,122 @@ int cscf_get_cseq(struct sip_msg *msg,struct hdr_field **hr) return nr; } +/** + * Returns the first header structure for a given header name. + * @param msg - the SIP message to look into + * @param header_name - the name of the header to search for + * @returns the hdr_field on success or NULL if not found + */ +struct hdr_field* cscf_get_header(struct sip_msg * msg, str header_name) { + struct hdr_field *h; + if (parse_headers(msg, HDR_EOH_F, 0) < 0) { + LM_ERR("cscf_get_path: error parsing headers\n"); + return NULL ; + } + h = msg->headers; + while (h) { + if (h->name.len == header_name.len + && strncasecmp(h->name.s, header_name.s, header_name.len) == 0) + break; + h = h->next; + } + return h; +} + + +static str p_charging_vector = {"P-Charging-Vector", 17}; + +int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, + str * term_ioi) { + struct hdr_field* header = 0; + str header_body = { 0, 0 }; + char * p; + int index; + str temp = { 0, 0 }; + + LM_DBG("get_p_charging_vector\n"); + header = cscf_get_header(msg, p_charging_vector); + if (!header) { + LM_DBG("no header %.*s was found\n", p_charging_vector.len, p_charging_vector.s); + return 0; + } + if (!header->body.s || !header->body.len) + return 0; + + str_dup(header_body, header->body, pkg); + + LM_DBG("p_charging_vector body is %.*s\n", header_body.len, header_body.s); + + p = strtok(header_body.s, " ;:\r\t\n\"="); + loop: if (p > (header_body.s + header_body.len)) + return 1; + + if (strncmp(p, "icid-value", 10) == 0) { + p = strtok(NULL, " ;:\r\t\n\"="); + if (p > (header_body.s + header_body.len)) { + LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); + return 0; + } + temp.s = p; + temp.len = 0; + while (*p != '\"') { + temp.len = temp.len + 1; + p++; + } + icid->len = temp.len; + index = temp.s - header_body.s; + LM_DBG("icid len %i, index %i\n", temp.len, index); + icid->s = header->body.s + index; + LM_DBG("icid is %.*s\n", icid->len, icid->s); + p = strtok(NULL, " ;:\r\t\n\"="); + goto loop; + } else if (strncmp(p, "orig-ioi", 8) == 0) { + + p = strtok(NULL, " ;:\r\t\n\"="); + if (p > (header_body.s + header_body.len)) { + LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); + return 0; + } + temp.s = p; + temp.len = 0; + while (*p != '\"') { + temp.len = temp.len + 1; + p++; + } + orig_ioi->len = temp.len; + index = temp.s - header_body.s; + LM_DBG("orig ioi len %i, index %i\n", temp.len, index); + orig_ioi->s = header->body.s + index; + LM_DBG("orig_ioi is %.*s\n", orig_ioi->len, orig_ioi->s); + p = strtok(NULL, " ;:\r\t\n\"="); + goto loop; + } else if (strncmp(p, "term-ioi", 8) == 0) { + + p = strtok(NULL, " ;:\r\t\n\"="); + if (p > (header_body.s + header_body.len)) { + LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); + return 0; + } + temp.s = p; + temp.len = 0; + while (*p != '\"') { + temp.len = temp.len + 1; + p++; + } + term_ioi->len = temp.len; + term_ioi->s = header->body.s + (temp.s - header_body.s); + p = strtok(NULL, " ;:\r\t\n\"="); + goto loop; + } else { + p = strtok(NULL, " ;:\r\t\n\"="); + goto loop; + } + + LM_DBG("end\n"); + str_free(header_body, pkg); + return 1; + out_of_memory: + LM_ERR("cscf_get_p_charging_vector:out of pkg memory\n"); + return 0; +} + diff --git a/lib/ims/ims_getters.h b/lib/ims/ims_getters.h index a36e0f3..38c0dd9 100644 --- a/lib/ims/ims_getters.h +++ b/lib/ims/ims_getters.h @@ -410,5 +410,21 @@ int cscf_add_header_rpl(struct sip_msg *msg, str *hdr); */ int cscf_get_cseq(struct sip_msg *msg,struct hdr_field **hr); +/** + * Returns the first header structure for a given header name. + * @param msg - the SIP message to look into + * @param header_name - the name of the header to search for + * @returns the hdr_field on success or NULL if not found + */ +struct hdr_field* cscf_get_header(struct sip_msg * msg, str header_name); + +/** + * Retrieves the P-Charging-Vector header information + * P-Charging-Vector: + * @param msg - the SIP message to retrieve from + * @returns #CSCF_RETURN_TRUE if ok or #CSCF_RETURN_FALSE on error + */ +int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, str * term_ioi); + #endif

11 years, 7 months

git:jason.penton/ims_ro_interface: dialog_ng: added few functions to API to access current dialog for example

by Jason Penton

Module: sip-router Branch: jason.penton/ims_ro_interface Commit: b8f2455b1911a88977e2327a13c6ca988d6041a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b8f2455… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Mar 12 13:18:27 2013 +0200 dialog_ng: added few functions to API to access current dialog for example --- modules/dialog_ng/dialog.c | 1 + modules/dialog_ng/dlg_cb.h | 2 -- modules/dialog_ng/dlg_load.h | 4 ++++ modules/dialog_ng/dlg_profile.c | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/dialog_ng/dialog.c b/modules/dialog_ng/dialog.c index 748515d..acbeb02 100644 --- a/modules/dialog_ng/dialog.c +++ b/modules/dialog_ng/dialog.c @@ -252,6 +252,7 @@ int load_dlg(struct dlg_binds *dlgb) { dlgb->get_dlg_var = api_get_dlg_variable; dlgb->terminate_dlg = w_api_terminate_dlg; dlgb->get_dlg_expires = api_get_dlg_expires; + dlgb->get_current_dlg = get_current_dialog; return 1; } diff --git a/modules/dialog_ng/dlg_cb.h b/modules/dialog_ng/dlg_cb.h index 2bed062..072e87a 100644 --- a/modules/dialog_ng/dlg_cb.h +++ b/modules/dialog_ng/dlg_cb.h @@ -70,8 +70,6 @@ typedef int (*set_dlg_variable_f)( str* callid, str* ftag, str* ttag, typedef str* (*get_dlg_variable_f)( str *callid, str *ftag, str *ttag, str* key); -typedef struct dlg_cell* (*get_current_dlg_f)( struct sip_msg* msg); - #define DLGCB_LOADED (1<<0) #define DLGCB_CREATED (1<<1) #define DLGCB_FAILED (1<<2) diff --git a/modules/dialog_ng/dlg_load.h b/modules/dialog_ng/dlg_load.h index 80e97d6..ff2920a 100644 --- a/modules/dialog_ng/dlg_load.h +++ b/modules/dialog_ng/dlg_load.h @@ -38,6 +38,9 @@ typedef int (*terminate_dlg_f)(str *callid, str *ftag, str *ttag, str *hdrs, str /* get_dlg_lifetime function prototype */ typedef time_t (*get_dlg_expires_f)(str *callid, str *ftag, str *ttag); +/* get_current_dlg function prototype */ +typedef struct dlg_cell* (*get_current_dlg_f)( struct sip_msg* msg); + struct dlg_binds { register_dlgcb_f register_dlgcb; register_dlgcb_nodlg_f register_dlgcb_nodlg; @@ -45,6 +48,7 @@ struct dlg_binds { set_dlg_variable_f set_dlg_var; get_dlg_variable_f get_dlg_var; get_dlg_expires_f get_dlg_expires; + get_current_dlg_f get_current_dlg; }; diff --git a/modules/dialog_ng/dlg_profile.c b/modules/dialog_ng/dlg_profile.c index b76fef4..ffca7c2 100644 --- a/modules/dialog_ng/dlg_profile.c +++ b/modules/dialog_ng/dlg_profile.c @@ -358,7 +358,7 @@ struct dlg_cell *get_current_dialog(struct sip_msg *msg) LM_DBG("Get Current Dialog: SIP Method - %.*s", msg->first_line.u.request.method.len, msg->first_line.u.request.method.s); /* use the per-process static holder */ if (msg->id==current_dlg_msg_id){ - LM_DBG("Message Id [%i] equals current dlg msg id [%i] - returning current dlg pointer", msg->id, current_dlg_msg_id); + LM_DBG("Message Id [%i] equals current dlg msg id [%i] - returning current dlg pointer [%p]", msg->id, current_dlg_msg_id, current_dlg_pointer); return current_dlg_pointer; } LM_DBG("Message Id [%i] not equal to current point dlg id [%i] - returning null", msg->id, current_dlg_msg_id);

11 years, 7 months

git:jason.penton/ims_ro_interface: modules/ims_ro: working prototype

by Jason Penton

Module: sip-router Branch: jason.penton/ims_ro_interface Commit: 0b277ec1f8aa2bc86c9ce67c7f520a9f7e34802d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b277ec… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Mar 12 13:13:51 2013 +0200 modules/ims_ro: working prototype --- modules/ims_ro/Makefile | 22 + modules/ims_ro/Ro_data.c | 289 ++++++++++++ modules/ims_ro/Ro_data.h | 410 +++++++++++++++++ modules/ims_ro/ccr.c | 329 ++++++++++++++ modules/ims_ro/ccr.h | 10 + modules/ims_ro/config.h | 12 + modules/ims_ro/diameter_ro.c | 40 ++ modules/ims_ro/diameter_ro.h | 11 + modules/ims_ro/ims_ro.c | 931 ++++++++++++++++++++++++++++++++++++++ modules/ims_ro/ims_ro.h | 13 + modules/ims_ro/mod.c | 493 ++++++++++++++++++++ modules/ims_ro/mod.h | 26 + modules/ims_ro/ro_fixup.c | 19 + modules/ims_ro/ro_fixup.h | 14 + modules/ims_ro/ro_session.c | 81 ++++ modules/ims_ro/ro_session.h | 66 +++ modules/ims_ro/ro_session_hash.c | 244 ++++++++++ modules/ims_ro/ro_session_hash.h | 217 +++++++++ modules/ims_ro/ro_timer.c | 242 ++++++++++ modules/ims_ro/ro_timer.h | 84 ++++ 20 files changed, 3553 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0b2…

11 years, 7 months

git:jason.penton/ims_ro_interface DELETED: modules/ims_ro: cleanup and fixes

by Jason Penton

Module: sip-router Branch: jason.penton/ims_ro_interface DELETED Commit: 42fcc68916d9f76b85dedd09cebf0f21c69f7ab8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=42fcc68… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Fri Mar 1 15:18:03 2013 +0200 modules/ims_ro: cleanup and fixes --- modules/ims_ro/Ro_data.c | 41 +----------- modules/ims_ro/Ro_data.h | 19 ------ modules/ims_ro/ccr.c | 119 +++++++++++++++-------------------- modules/ims_ro/config.h | 68 +------------------- modules/ims_ro/diameter_ro.c | 54 ---------------- modules/ims_ro/diameter_ro.h | 55 ---------------- modules/ims_ro/ims_ro.c | 143 +++++++++++++----------------------------- modules/ims_ro/ims_ro.h | 55 ---------------- modules/ims_ro/mod.c | 118 +++++++++++++++++++++++++--------- 9 files changed, 187 insertions(+), 485 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=42f…

11 years, 7 months

← Newer
1
...
27
28
29
30
31
32
33
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013