sr-dev

sr-dev@lists.kamailio.org

16 participants
45406 discussions

git:master: kamailio.cfg: load debugger module for WITH_DEBUG
by Daniel-Constantin Mierla 27 Feb '11

27 Feb '11

Module: sip-router Branch: master Commit: 66d0041ec8270d4151136477b80edca66201434e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=66d0041… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Feb 27 23:56:43 2011 +0100 kamailio.cfg: load debugger module for WITH_DEBUG - set cfgtrace parameter to 1 in this case --- etc/kamailio.cfg | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 9aa3915..6d39ee9 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -241,6 +241,10 @@ loadmodule "pike.so" loadmodule "xmlrpc.so" #!endif +#!ifdef WITH_DEBUG +loadmodule "debugger.so" +#!endif + # ----------------- setting module-specific parameters --------------- @@ -388,6 +392,11 @@ modparam("xmlrpc", "route", "XMLRPC"); modparam("xmlrpc", "url_match", "^/RPC") #!endif +#!ifdef WITH_DEBUG +# ----- debugger params ----- +modparam("debugger", "cfgtrace", 1) +#!endif + ####### Routing Logic ########

1 0

git:3.1: kcore: supported header exports the free function in parsed structure
by Daniel-Constantin Mierla 27 Feb '11

27 Feb '11

Module: sip-router Branch: 3.1 Commit: 7310ba9d6c808dc932fe1e925b9e36e57f6b473e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7310ba9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Feb 27 16:43:06 2011 +0100 kcore: supported header exports the free function in parsed structure - parsing the supported header creates a structure allocated in PKG, now it exports the function to free it in order to be used when cleaning the SIP message structure - this fixes a memory leak when parsing the header - reported and troubleshooted by Bayan Towfiq (cherry picked from commit 9a668406925abf19cbae62c98a12b86f4c045b34) --- lib/kcore/parse_supported.c | 21 +++++++++++++++++++++ lib/kcore/parse_supported.h | 10 +++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/lib/kcore/parse_supported.c b/lib/kcore/parse_supported.c index 8720397..8c81cfb 100644 --- a/lib/kcore/parse_supported.c +++ b/lib/kcore/parse_supported.c @@ -112,6 +112,17 @@ static inline int parse_supported_body(str *body, unsigned int *sup) return 0; } + +/** + * wrapper to free the content of parsed supported header + */ +void hf_free_supported(void *parsed) +{ + struct supported_body *sb; + sb = (struct supported_body*)parsed; + free_supported(&sb); +} + /*! * Parse all Supported headers */ @@ -144,6 +155,7 @@ int parse_supported( struct sip_msg *msg) } parse_supported_body(&(hdr->body), &(sb->supported)); + sb->hfree = hf_free_supported; sb->supported_all = 0; hdr->parsed = (void*)sb; supported |= sb->supported; @@ -153,3 +165,12 @@ int parse_supported( struct sip_msg *msg) supported; return 0; } + +/* free supported header structure */ +void free_supported(struct supported_body **sb) +{ + if (sb && *sb) { + pkg_free(*sb); + *sb = 0; + } +} diff --git a/lib/kcore/parse_supported.h b/lib/kcore/parse_supported.h index 126f56e..55f04f8 100644 --- a/lib/kcore/parse_supported.h +++ b/lib/kcore/parse_supported.h @@ -36,6 +36,7 @@ #define PARSE_SUPPORTED_H #include "../../parser/msg_parser.h" +#include "../../parser/hf.h" #include "../../mem/mem.h" @@ -64,6 +65,7 @@ struct supported_body { + hf_parsed_free_f hfree; /* function to free the content */ unsigned int supported; /* supported mask for the current hdr */ unsigned int supported_all; /* suppoted mask for the all "supported" hdr * - it's set only for the first hdr in @@ -77,12 +79,6 @@ struct supported_body { int parse_supported( struct sip_msg *msg); -static inline void free_supported(struct supported_body **sb) -{ - if (sb && *sb) { - pkg_free(*sb); - *sb = 0; - } -} +void free_supported(struct supported_body **sb); #endif /* PARSE_SUPPORTED_H */

1 0

git:3.1: core: framework for generic free of parsed headers
by Daniel-Constantin Mierla 27 Feb '11

27 Feb '11

Module: sip-router Branch: 3.1 Commit: 0299c9e29cd51b9c0fba8cdad0e1354e95f4c17c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0299c9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Feb 27 16:40:37 2011 +0100 core: framework for generic free of parsed headers - the structure of parsed headers can define as first field a function to free the content - this allow to implement the parser for headers our of the core (cherry picked from commit 81d05af470d979b3d3f104bbdaa287b3fa58b57c) --- parser/hf.c | 3 +++ parser/hf.h | 7 +++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/parser/hf.c b/parser/hf.c index fe6b7a7..8863a10 100644 --- a/parser/hf.c +++ b/parser/hf.c @@ -130,6 +130,9 @@ void clean_hdr_field(struct hdr_field* hf) break; case HDR_SUPPORTED_T: + if(*h_parsed) { + ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); + } break; case HDR_REQUIRE_T: diff --git a/parser/hf.h b/parser/hf.h index f496e9a..035c91c 100644 --- a/parser/hf.h +++ b/parser/hf.h @@ -213,6 +213,13 @@ typedef struct hdr_field { } hdr_field_t; +/* type of the function to free the structure of parsed header field */ +typedef void (*hf_parsed_free_f)(void *parsed); + +/* structure to hold the function to free the parsed header field */ +typedef struct hdr_parsed { + hf_parsed_free_f hfree; +} hf_parsed_t; /** returns true if the header links allocated memory on parse field. */ static inline int hdr_allocs_parse(struct hdr_field* hdr)

1 0

git:master: core: framework for generic free of parsed headers
by Daniel-Constantin Mierla 27 Feb '11

27 Feb '11

Module: sip-router Branch: master Commit: 81d05af470d979b3d3f104bbdaa287b3fa58b57c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81d05af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Feb 27 16:40:37 2011 +0100 core: framework for generic free of parsed headers - the structure of parsed headers can define as first field a function to free the content - this allow to implement the parser for headers our of the core --- parser/hf.c | 3 +++ parser/hf.h | 7 +++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/parser/hf.c b/parser/hf.c index fe6b7a7..8863a10 100644 --- a/parser/hf.c +++ b/parser/hf.c @@ -130,6 +130,9 @@ void clean_hdr_field(struct hdr_field* hf) break; case HDR_SUPPORTED_T: + if(*h_parsed) { + ((hf_parsed_t*)(*h_parsed))->hfree(*h_parsed); + } break; case HDR_REQUIRE_T: diff --git a/parser/hf.h b/parser/hf.h index f496e9a..035c91c 100644 --- a/parser/hf.h +++ b/parser/hf.h @@ -213,6 +213,13 @@ typedef struct hdr_field { } hdr_field_t; +/* type of the function to free the structure of parsed header field */ +typedef void (*hf_parsed_free_f)(void *parsed); + +/* structure to hold the function to free the parsed header field */ +typedef struct hdr_parsed { + hf_parsed_free_f hfree; +} hf_parsed_t; /** returns true if the header links allocated memory on parse field. */ static inline int hdr_allocs_parse(struct hdr_field* hdr)

1 0

git:master: kcore: supported header exports the free function in parsed structure
by Daniel-Constantin Mierla 27 Feb '11

27 Feb '11

Module: sip-router Branch: master Commit: 9a668406925abf19cbae62c98a12b86f4c045b34 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a66840… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Feb 27 16:43:06 2011 +0100 kcore: supported header exports the free function in parsed structure - parsing the supported header creates a structure allocated in PKG, now it exports the function to free it in order to be used when cleaning the SIP message structure - this fixes a memory leak when parsing the header - reported and troubleshooted by Bayan Towfiq --- lib/kcore/parse_supported.c | 21 +++++++++++++++++++++ lib/kcore/parse_supported.h | 10 +++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/lib/kcore/parse_supported.c b/lib/kcore/parse_supported.c index 8720397..8c81cfb 100644 --- a/lib/kcore/parse_supported.c +++ b/lib/kcore/parse_supported.c @@ -112,6 +112,17 @@ static inline int parse_supported_body(str *body, unsigned int *sup) return 0; } + +/** + * wrapper to free the content of parsed supported header + */ +void hf_free_supported(void *parsed) +{ + struct supported_body *sb; + sb = (struct supported_body*)parsed; + free_supported(&sb); +} + /*! * Parse all Supported headers */ @@ -144,6 +155,7 @@ int parse_supported( struct sip_msg *msg) } parse_supported_body(&(hdr->body), &(sb->supported)); + sb->hfree = hf_free_supported; sb->supported_all = 0; hdr->parsed = (void*)sb; supported |= sb->supported; @@ -153,3 +165,12 @@ int parse_supported( struct sip_msg *msg) supported; return 0; } + +/* free supported header structure */ +void free_supported(struct supported_body **sb) +{ + if (sb && *sb) { + pkg_free(*sb); + *sb = 0; + } +} diff --git a/lib/kcore/parse_supported.h b/lib/kcore/parse_supported.h index 126f56e..55f04f8 100644 --- a/lib/kcore/parse_supported.h +++ b/lib/kcore/parse_supported.h @@ -36,6 +36,7 @@ #define PARSE_SUPPORTED_H #include "../../parser/msg_parser.h" +#include "../../parser/hf.h" #include "../../mem/mem.h" @@ -64,6 +65,7 @@ struct supported_body { + hf_parsed_free_f hfree; /* function to free the content */ unsigned int supported; /* supported mask for the current hdr */ unsigned int supported_all; /* suppoted mask for the all "supported" hdr * - it's set only for the first hdr in @@ -77,12 +79,6 @@ struct supported_body { int parse_supported( struct sip_msg *msg); -static inline void free_supported(struct supported_body **sb) -{ - if (sb && *sb) { - pkg_free(*sb); - *sb = 0; - } -} +void free_supported(struct supported_body **sb); #endif /* PARSE_SUPPORTED_H */

1 0

git:master: pv: added $mt - return sip message type
by Daniel-Constantin Mierla 27 Feb '11

27 Feb '11

Module: sip-router Branch: master Commit: 1baf83e9407bbbe1b25e390ed013a7ef87ffc196 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1baf83e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Feb 26 23:25:07 2011 +0100 pv: added $mt - return sip message type - the value is 1 if the sip message is request - the value is 2 if the sip message is reply --- modules_k/pv/pv.c | 3 +++ modules_k/pv/pv_core.c | 16 ++++++++++++++++ modules_k/pv/pv_core.h | 3 +++ 3 files changed, 22 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index e690ef7..77898cf 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -220,6 +220,9 @@ static pv_export_t mod_pvs[] = { {{"ml", (sizeof("ml")-1)}, /* */ PVT_OTHER, pv_get_msg_len, 0, 0, 0, 0, 0}, + {{"mt", (sizeof("mt")-1)}, /* */ + PVT_OTHER, pv_get_msgtype, 0, + 0, 0, 0, 0}, {{"od", (sizeof("od")-1)}, /* */ PVT_OTHER, pv_get_ouri_attr, 0, 0, 0, pv_init_iname, 2}, diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index f0b6415..698bda0 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -152,6 +152,22 @@ int pv_get_methodid(struct sip_msg *msg, pv_param_t *param, (unsigned int)(get_cseq(msg)->method_id)); } +int pv_get_msgtype(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + unsigned int type = 0; + + if(msg==NULL) + return -1; + + if(msg->first_line.type == SIP_REQUEST) + type = 1; + else if(msg->first_line.type == SIP_REPLY) + type = 2; + + return pv_get_uintval(msg, param, res, type); +} + int pv_get_version(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/modules_k/pv/pv_core.h b/modules_k/pv/pv_core.h index 3ee11b7..f222f59 100644 --- a/modules_k/pv/pv_core.h +++ b/modules_k/pv/pv_core.h @@ -48,6 +48,9 @@ int pv_get_method(struct sip_msg *msg, pv_param_t *param, int pv_get_methodid(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_msgtype(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_status(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master: siputils: documented new functions
by Daniel-Constantin Mierla 27 Feb '11

27 Feb '11

Module: sip-router Branch: master Commit: d4eb2e661ad72d0a6b70aea853e428608e80ab2b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4eb2e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Feb 26 22:26:29 2011 +0100 siputils: documented new functions - readme updated with is_request() and is_reply() --- modules_k/siputils/README | 34 +++++++++++++++++++++++ modules_k/siputils/doc/siputils_admin.xml | 42 +++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 0 deletions(-) diff --git a/modules_k/siputils/README b/modules_k/siputils/README index 23ccd30..b217f7b 100644 --- a/modules_k/siputils/README +++ b/modules_k/siputils/README @@ -91,6 +91,8 @@ Gabriel Vasile 4.18. append_rpid_hf(prefix, suffix) 4.19. is_rpid_user_e164() 4.20. set_uri_user(uri, user) + 4.21. is_request() + 4.22. is_reply() List of Examples @@ -123,6 +125,8 @@ Gabriel Vasile 1.27. append_rpid_hf(prefix, suffix) usage 1.28. is_rpid_user_e164 usage 1.29. set_uri_user usage + 1.30. is_request usage + 1.31. is_reply usage Chapter 1. Admin Guide @@ -168,6 +172,8 @@ Chapter 1. Admin Guide 4.18. append_rpid_hf(prefix, suffix) 4.19. is_rpid_user_e164() 4.20. set_uri_user(uri, user) + 4.21. is_request() + 4.22. is_reply() 1. Overview @@ -362,6 +368,8 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") 4.18. append_rpid_hf(prefix, suffix) 4.19. is_rpid_user_e164() 4.20. set_uri_user(uri, user) + 4.21. is_request() + 4.22. is_reply() 4.1. ring_insert_callid() @@ -731,3 +739,29 @@ $var(uri) = "sip:user@host"; $var(user) = "new_user"; set_uri_user("$var(uri)", "$var(user)"); ... + +4.21. is_request() + + Return true if the SIP message is a request. + + This function can be used from ANY_ROUTE. + + Example 1.30. is_request usage +... +if (is_request()) { + ... +} +... + +4.22. is_reply() + + Return true if the SIP message is a reply. + + This function can be used from ANY_ROUTE. + + Example 1.31. is_reply usage +... +if (is_reply()) { + ... +} +... diff --git a/modules_k/siputils/doc/siputils_admin.xml b/modules_k/siputils/doc/siputils_admin.xml index fd8ec1d..7950392 100644 --- a/modules_k/siputils/doc/siputils_admin.xml +++ b/modules_k/siputils/doc/siputils_admin.xml @@ -860,6 +860,48 @@ set_uri_user("$var(uri)", "$var(user)"); </programlisting> </example> </section> + <section> + <title> + <function moreinfo="none">is_request()</function> + </title> + <para> + Return true if the SIP message is a request. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>is_request</function> usage</title> + <programlisting format="linespecific"> +... +if (is_request()) { + ... +} +... +</programlisting> + </example> + </section> + <section> + <title> + <function moreinfo="none">is_reply()</function> + </title> + <para> + Return true if the SIP message is a reply. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>is_reply</function> usage</title> + <programlisting format="linespecific"> +... +if (is_reply()) { + ... +} +... +</programlisting> + </example> + </section> </section> </chapter>

1 0

git:master: siputils: added functions to detect type of SIP message
by Daniel-Constantin Mierla 27 Feb '11

27 Feb '11

Module: sip-router Branch: master Commit: f82c04eb21aa496b883c0e4ee486b247efeb04c9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f82c04e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Feb 26 22:20:49 2011 +0100 siputils: added functions to detect type of SIP message - is_request() returns true if the SIP message is a request - is_reply() returns true if the SIP message is a reply - useful to check in sub-routes that can be executed from both request and reply routes --- modules_k/siputils/checks.c | 27 +++++++++++++++++ modules_k/siputils/checks.h | 10 ++++++ modules_k/siputils/siputils.c | 64 +++++++++++++++++++++++++---------------- 3 files changed, 76 insertions(+), 25 deletions(-) diff --git a/modules_k/siputils/checks.c b/modules_k/siputils/checks.c index c0cee5f..f729739 100644 --- a/modules_k/siputils/checks.c +++ b/modules_k/siputils/checks.c @@ -54,6 +54,33 @@ #include "../../lvalue.h" #include "checks.h" +/** + * return 1 (true) if the SIP message type is request + */ +int w_is_request(struct sip_msg* msg, char *foo, char *bar) +{ + if(msg==NULL) + return -1; + + if(msg->first_line.type == SIP_REQUEST) + return 1; + + return -1; +} + +/** + * return 1 (true) if the SIP message type is reply + */ +int w_is_reply(struct sip_msg* msg, char *foo, char *bar) +{ + if(msg==NULL) + return -1; + + if(msg->first_line.type == SIP_REPLY) + return 1; + + return -1; +} /* * Checks if From includes a To-tag -- good to identify diff --git a/modules_k/siputils/checks.h b/modules_k/siputils/checks.h index cb49850..eeb2788 100644 --- a/modules_k/siputils/checks.h +++ b/modules_k/siputils/checks.h @@ -95,4 +95,14 @@ int is_e164(struct sip_msg* _m, char* _sp, char* _s2); */ int set_uri_user(struct sip_msg* _m, char* _uri, char* _value); +/* + * Return true (1) if SIP message is request, otherwise false (-1) + */ +int w_is_request(struct sip_msg* msg, char *foo, char *bar); + +/* + * Return true (1) if SIP message is reply, otherwise false (-1) + */ +int w_is_reply(struct sip_msg* msg, char *foo, char *bar); + #endif /* CHECKS_H */ diff --git a/modules_k/siputils/siputils.c b/modules_k/siputils/siputils.c index 3b31ad0..054dc9b 100644 --- a/modules_k/siputils/siputils.c +++ b/modules_k/siputils/siputils.c @@ -113,36 +113,50 @@ static int fixup_free_set_uri(void** param, int param_no); char *contact_flds_separator = DEFAULT_SEPARATOR; static cmd_export_t cmds[]={ - {"ring_insert_callid", (cmd_function)ring_insert_callid, 0, ring_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, - {"options_reply", (cmd_function)opt_reply, 0, 0, 0, REQUEST_ROUTE}, - {"is_user", (cmd_function)is_user, 1, fixup_str_null, 0, REQUEST_ROUTE|LOCAL_ROUTE}, - {"has_totag", (cmd_function)has_totag, 0, 0, 0, ANY_ROUTE}, - {"uri_param", (cmd_function)uri_param_1, 1, fixup_str_null, 0, REQUEST_ROUTE|LOCAL_ROUTE}, - {"uri_param", (cmd_function)uri_param_2, 2, fixup_str_str, 0, REQUEST_ROUTE|LOCAL_ROUTE}, - {"add_uri_param", (cmd_function)add_uri_param, 1, fixup_str_null, 0, REQUEST_ROUTE}, - {"tel2sip", (cmd_function)tel2sip, 0, 0, 0, REQUEST_ROUTE}, - {"is_e164", (cmd_function)is_e164, 1, fixup_pvar_null, fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, - {"is_uri_user_e164", (cmd_function)is_uri_user_e164, 1, fixup_pvar_null, fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, - {"encode_contact", (cmd_function)encode_contact,2,0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, - {"decode_contact", (cmd_function)decode_contact,0,0, 0, REQUEST_ROUTE}, - {"decode_contact_header", (cmd_function)decode_contact_header,0,0,0,REQUEST_ROUTE|ONREPLY_ROUTE}, - {"cmp_uri", (cmd_function)w_cmp_uri, 2, - fixup_spve_spve, 0, - ANY_ROUTE}, - {"cmp_aor", (cmd_function)w_cmp_aor, 2, - fixup_spve_spve, 0, - ANY_ROUTE}, - {"is_rpid_user_e164", (cmd_function)is_rpid_user_e164, 0, 0, + {"ring_insert_callid", (cmd_function)ring_insert_callid, 0, ring_fixup, + 0, REQUEST_ROUTE|FAILURE_ROUTE}, + {"options_reply", (cmd_function)opt_reply, 0, 0, + 0, REQUEST_ROUTE}, + {"is_user", (cmd_function)is_user, 1, fixup_str_null, + 0, REQUEST_ROUTE|LOCAL_ROUTE}, + {"has_totag", (cmd_function)has_totag, 0, 0, + 0, ANY_ROUTE}, + {"uri_param", (cmd_function)uri_param_1, 1, fixup_str_null, + 0, REQUEST_ROUTE|LOCAL_ROUTE}, + {"uri_param", (cmd_function)uri_param_2, 2, fixup_str_str, + 0, REQUEST_ROUTE|LOCAL_ROUTE}, + {"add_uri_param", (cmd_function)add_uri_param, 1, fixup_str_null, + 0, REQUEST_ROUTE}, + {"tel2sip", (cmd_function)tel2sip, 0, 0, + 0, REQUEST_ROUTE}, + {"is_e164", (cmd_function)is_e164, 1, fixup_pvar_null, + fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, + {"is_uri_user_e164", (cmd_function)is_uri_user_e164, 1, fixup_pvar_null, + fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, + {"encode_contact", (cmd_function)encode_contact, 2, 0, + 0, REQUEST_ROUTE|ONREPLY_ROUTE}, + {"decode_contact", (cmd_function)decode_contact, 0, 0, + 0, REQUEST_ROUTE}, + {"decode_contact_header", (cmd_function)decode_contact_header, 0, 0, + 0,REQUEST_ROUTE|ONREPLY_ROUTE}, + {"cmp_uri", (cmd_function)w_cmp_uri, 2, fixup_spve_spve, + 0, ANY_ROUTE}, + {"cmp_aor", (cmd_function)w_cmp_aor, 2, fixup_spve_spve, + 0, ANY_ROUTE}, + {"is_rpid_user_e164", (cmd_function)is_rpid_user_e164, 0, 0, 0, REQUEST_ROUTE}, - {"append_rpid_hf", (cmd_function)append_rpid_hf, 0, 0, + {"append_rpid_hf", (cmd_function)append_rpid_hf, 0, 0, 0, REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, - {"append_rpid_hf", (cmd_function)append_rpid_hf_p, 2, fixup_str_str, + {"append_rpid_hf", (cmd_function)append_rpid_hf_p, 2, fixup_str_str, 0, REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, - {"set_uri_user", (cmd_function)set_uri_user, 2, fixup_set_uri, - fixup_free_set_uri, - REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE}, + {"set_uri_user", (cmd_function)set_uri_user, 2, fixup_set_uri, + fixup_free_set_uri, ANY_ROUTE}, {"bind_siputils", (cmd_function)bind_siputils, 0, 0, 0, 0}, + {"is_request", (cmd_function)w_is_request, 0, 0, + 0, ANY_ROUTE}, + {"is_reply", (cmd_function)w_is_reply, 0, 0, + 0, ANY_ROUTE}, {0,0,0,0,0,0} };

1 0

Kamailio Installation
by Suresh Bhandari 27 Feb '11

27 Feb '11

Hello Community, I am new to Kamailio, and this list as well. I am trying to install Kamailio 3.1.2, but I am getting too many errors. I have fixed some but still not getting the way. I am using Red Hat Enterprise Linux (RHEL) 5, and /usr/local directory. When I ran the following command: make group_include="standard standard-dep mysql" include_modules="carrierroute peering" install it prompted not found error for the file docbookx.dtd, I found it (modules/auth/auth.xml, and modules_s/acc_syslog/acc_syslog.xml) and fixed it as it was errorenous URL location. For reference earlier it was http://www.oasis-open.org/docbookid/id/g/4.5/docbookx.dtd, which I changed to http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd. Now when I run the previous command again, I am getting the follwing errors: *nsgmls:<URL>http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd:116:17:E: "X20AC" is not a function name* If I ignore this, and continue, I am not able to find the "sip-router" service in /etc/init.d. The entire errors is attached here. Please help me solve the issue. TIA

2 1

git:master: modules/dialplan: change in dp_translate return code
by Juha Heinanen 27 Feb '11

27 Feb '11

Module: sip-router Branch: master Commit: f7b5a333d29579a700d636787550ff1430a58189 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f7b5a33… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Feb 27 06:54:44 2011 +0200 modules/dialplan: change in dp_translate return code - dp_translate now returns -2 (instead of -1) if dp with given id does not exist. --- modules/dialplan/README | 3 +++ modules/dialplan/dialplan.c | 2 +- modules/dialplan/doc/dialplan_admin.xml | 4 ++++ 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/modules/dialplan/README b/modules/dialplan/README index cf9d9d5..e03067d 100644 --- a/modules/dialplan/README +++ b/modules/dialplan/README @@ -334,6 +334,9 @@ modparam("dialplan", "fetch_rows", 4000) with dialplan ID equal to id. If dest is missing, only matching and storing of matching rule's attributes is done. + Returns 1, if translation succeeded, -1 in case of some error occurred, + and -2 if dialplan with ID equal to id does not exist. + Meaning of the parameters is as follows: * id -the dialplan id of the possible matching rules. This parameter can have the following types: diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index 4c86778..16050cc 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -326,7 +326,7 @@ static int dp_translate_f(struct sip_msg* msg, char* str1, char* str2) if ((idp = select_dpid(dpid)) ==0 ){ LM_DBG("no information available for dpid %i\n", dpid); - return -1; + return -2; } repl_par = (str2!=NULL)? ((dp_param_p)str2):default_par2; diff --git a/modules/dialplan/doc/dialplan_admin.xml b/modules/dialplan/doc/dialplan_admin.xml index ac9a84d..43c418b 100644 --- a/modules/dialplan/doc/dialplan_admin.xml +++ b/modules/dialplan/doc/dialplan_admin.xml @@ -365,6 +365,10 @@ modparam("dialplan", "fetch_rows", 4000) missing, only matching and storing of matching rule's attributes is done. </para> + <para> + Returns 1, if translation succeeded, -1 in case of some error + occurred, and -2 if dialplan with ID equal to id does not exist. + </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev