sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
438 discussions

git:pd/outbound: modules_k/path: Added outbound support to add_path()
by Peter Dunkley 26 Dec '12

26 Dec '12

Module: sip-router Branch: pd/outbound Commit: b27311b5ecc189b8324075a3387382c144ad438b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b27311b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Dec 26 14:15:48 2012 +0000 modules_k/path: Added outbound support to add_path() --- modules_k/path/path.c | 68 +++++++++++++++++++++++++++++++++++--------- modules_k/path/path_mod.c | 12 ++++++++ modules_k/path/path_mod.h | 4 ++- 3 files changed, 69 insertions(+), 15 deletions(-) diff --git a/modules_k/path/path.c b/modules_k/path/path.c index a8fb8aa..2362066 100644 --- a/modules_k/path/path.c +++ b/modules_k/path/path.c @@ -41,6 +41,10 @@ #include "path.h" #include "path_mod.h" +typedef enum { + PATH_PARAM_NONE, PATH_PARAM_RECEIVED, PATH_PARAM_OB +} path_param_t; + #define PATH_PREFIX "Path: <sip:" #define PATH_PREFIX_LEN (sizeof(PATH_PREFIX)-1) @@ -50,10 +54,20 @@ #define PATH_RC_PARAM ";received=" #define PATH_RC_PARAM_LEN (sizeof(PATH_RC_PARAM)-1) +#define PATH_OB_PARAM ";ob" +#define PATH_OB_PARAM_LEN (sizeof(PATH_OB_PARAM)-1) + #define PATH_CRLF ">\r\n" #define PATH_CRLF_LEN (sizeof(PATH_CRLF)-1) -static int prepend_path(struct sip_msg* _m, str *user, int recv) +#define ALLOC_AND_COPY_PATH_HDR() \ + if ((suffix = pkg_malloc(suffix_len)) == NULL) { \ + LM_ERR("no pkg memory left for suffix\n"); \ + goto out1; \ + } \ + memcpy(suffix, PATH_LR_PARAM, PATH_LR_PARAM_LEN); + +static int prepend_path(struct sip_msg* _m, str *user, path_param_t param) { struct lump *l; char *prefix, *suffix, *crlf; @@ -76,15 +90,24 @@ static int prepend_path(struct sip_msg* _m, str *user, int recv) memcpy(prefix + prefix_len - 1, "@", 1); } - suffix_len = PATH_LR_PARAM_LEN + (recv ? PATH_RC_PARAM_LEN : 0); - suffix = pkg_malloc(suffix_len); - if (!suffix) { - LM_ERR("no pkg memory left for suffix\n"); - goto out1; + switch(param) { + default: + suffix_len = PATH_LR_PARAM_LEN; + ALLOC_AND_COPY_PATH_HDR(); + break; + case PATH_PARAM_RECEIVED: + suffix_len = PATH_LR_PARAM_LEN + PATH_RC_PARAM_LEN; + ALLOC_AND_COPY_PATH_HDR(); + memcpy(suffix + PATH_LR_PARAM_LEN, PATH_RC_PARAM, + PATH_RC_PARAM_LEN); + break; + case PATH_PARAM_OB: + suffix_len = PATH_LR_PARAM_LEN + PATH_OB_PARAM_LEN; + ALLOC_AND_COPY_PATH_HDR(); + memcpy(suffix + PATH_LR_PARAM_LEN, PATH_OB_PARAM, + PATH_OB_PARAM_LEN); + break; } - memcpy(suffix, PATH_LR_PARAM, PATH_LR_PARAM_LEN); - if(recv) - memcpy(suffix+PATH_LR_PARAM_LEN, PATH_RC_PARAM, PATH_RC_PARAM_LEN); crlf = pkg_malloc(PATH_CRLF_LEN); if (!crlf) { @@ -119,7 +142,7 @@ static int prepend_path(struct sip_msg* _m, str *user, int recv) if (!l) goto out2; l = insert_new_lump_before(l, suffix, suffix_len, 0); if (!l) goto out2; - if (recv) { + if (param == PATH_PARAM_RECEIVED) { /* TODO: agranig: optimize this one! */ src_ip = ip_addr2a(&_m->rcv.src_ip); rcv_addr.s = pkg_malloc(6 + IP_ADDR_MAX_STR_SIZE + 22); /* 'sip:<ip>:<port>;transport=sctp'\0 */ @@ -174,7 +197,24 @@ out4: int add_path(struct sip_msg* _msg, char* _a, char* _b) { str user = {0,0}; - return prepend_path(_msg, &user, 0); + int ret; + path_param_t param = PATH_PARAM_NONE; + + if (path_obb.use_outbound != NULL + && path_obb.use_outbound(_msg)) { + if (path_obb.encode_flow_token(&user, _msg->rcv) != 0) { + LM_ERR("encoding outbound flow token\n"); + return -1; + } + param = PATH_PARAM_OB; + } + + ret = prepend_path(_msg, &user, param); + + if (user.s != NULL) + pkg_free(user.s); + + return ret; } /*! \brief @@ -183,7 +223,7 @@ int add_path(struct sip_msg* _msg, char* _a, char* _b) */ int add_path_usr(struct sip_msg* _msg, char* _usr, char* _b) { - return prepend_path(_msg, (str*)_usr, 0); + return prepend_path(_msg, (str*)_usr, PATH_PARAM_NONE); } /*! \brief @@ -193,7 +233,7 @@ int add_path_usr(struct sip_msg* _msg, char* _usr, char* _b) int add_path_received(struct sip_msg* _msg, char* _a, char* _b) { str user = {0,0}; - return prepend_path(_msg, &user, 1); + return prepend_path(_msg, &user, PATH_PARAM_RECEIVED); } /*! \brief @@ -202,7 +242,7 @@ int add_path_received(struct sip_msg* _msg, char* _a, char* _b) */ int add_path_received_usr(struct sip_msg* _msg, char* _usr, char* _b) { - return prepend_path(_msg, (str*)_usr, 1); + return prepend_path(_msg, (str*)_usr, PATH_PARAM_RECEIVED); } /*! \brief diff --git a/modules_k/path/path_mod.c b/modules_k/path/path_mod.c index 5e91927..15fbc4d 100644 --- a/modules_k/path/path_mod.c +++ b/modules_k/path/path_mod.c @@ -52,6 +52,7 @@ #include "../../sr_module.h" #include "../../mem/mem.h" #include "../../mod_fix.h" +#include "../outbound/api.h" #include "../rr/api.h" #include "path.h" @@ -74,6 +75,10 @@ static int mod_init(void); */ struct rr_binds path_rrb; +/*! \brief + * outbound API + */ +ob_api_t path_obb; /*! \brief * Exported functions @@ -131,6 +136,13 @@ static int mod_init(void) return -1; } } + + if (ob_load_api(&path_obb) == 0) + LM_INFO("Bound path module to outbound module\n"); + else { + LM_INFO("outbound module not available\n"); + memset(&path_obb, 0, sizeof(ob_api_t)); + } return 0; } diff --git a/modules_k/path/path_mod.h b/modules_k/path/path_mod.h index 77f4897..f580362 100644 --- a/modules_k/path/path_mod.h +++ b/modules_k/path/path_mod.h @@ -34,7 +34,9 @@ #ifndef PATH_MOD_H #define PATH_MOD_H -extern int use_received; +#include "../outbound/api.h" +extern int use_received; +extern ob_api_t path_obb; #endif /* PATH_MOD_H */

1 0

git:pd/outbound: modules_k/path: Updated module documentation for outbound
by Peter Dunkley 26 Dec '12

26 Dec '12

Module: sip-router Branch: pd/outbound Commit: 11b7630b3f3423dd5697b9c1938f34ee851d325e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11b7630… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Dec 26 14:24:58 2012 +0000 modules_k/path: Updated module documentation for outbound --- modules_k/path/README | 53 +++++++++++++++++++++--------------- modules_k/path/doc/path_admin.xml | 13 +++++++++ 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/modules_k/path/README b/modules_k/path/README index df84d45..7624c54 100644 --- a/modules_k/path/README +++ b/modules_k/path/README @@ -8,7 +8,7 @@ Edited by Andreas Granig - Copyright � 2006 Inode GmbH + Copyright © 2006 Inode GmbH __________________________________________________________________ Table of Contents @@ -83,18 +83,18 @@ Chapter 1. Admin Guide 1.1. Path insertion for registrations - For registrations in a scenario like "[UAC] -> [P1] -> [REG]", the + For registrations in a scenario like “[UAC] -> [P1] -> [REG]”, the "path" module can be used at the intermediate proxy P1 to insert a Path header into the message before forwarding it to the registrar REG. Two functions can be used to achieve this: - * add_path(...) adds a Path header in the form of "Path: - <sip:1.2.3.4;lr>" to the message using the address of the outgoing + * add_path(...) adds a Path header in the form of “Path: + <sip:1.2.3.4;lr>” to the message using the address of the outgoing interface. A port is only added if it's not the default port 5060. If a username is passed to the function, it is also included in the - Path URI, like "Path: <sip:username@1.2.3.4;lr>". + Path URI, like “Path: <sip:username@1.2.3.4;lr>”. * add_path_received(...) also add a Path header in the same form as above, but also adds a parameter indicating the received-URI of the - message, like "Path: <sip:1.2.3.4;received=sip:2.3.4.5:1234;lr>". + message, like “Path: <sip:1.2.3.4;received=sip:2.3.4.5:1234;lr>”. This is especially useful if the proxy does NAT detection and wants to pass the NAT'ed address to the registrar. If the function is called with a username, it's included in the @@ -105,12 +105,12 @@ Chapter 1. Admin Guide If the NAT'ed address of an UAC is passed to the registrar, the registrar routes back subsequent requests using the Path header of the registration as Route header of the current request. If the - intermediate proxy had inserted a Path header including the "received" + intermediate proxy had inserted a Path header including the “received” parameter during the registration, this parameter will show up in the Route header of the new request as well, allowing the intermediate proxy to route to this address instead of the one propagated in the Route URI for tunneling through NAT. This behaviour can be activated by - setting the module parameter "use_received". + setting the module parameter “use_received”. 2. Dependencies @@ -121,7 +121,9 @@ Chapter 1. Admin Guide The following modules must be loaded before this module: * The "rr" module is needed for outbound routing according to the - "received" parameter. + “received” parameter. + * The "outbound" module is needed for outbound routing as per RFC + 5626. 2.2. External Libraries or Applications @@ -135,7 +137,7 @@ Chapter 1. Admin Guide 3.1. use_received (int) - If set to 1, the "received" parameter of the first Route URI is + If set to 1, the “received” parameter of the first Route URI is evaluated and used as destination-URI if present. Default value is 0. @@ -152,12 +154,19 @@ modparam("path", "use_received", 1) 4.3. add_path_received() 4.4. add_path_received(user) -4.1. add_path() +4.1. add_path() - This function is used to insert a Path header in the form "Path: - <sip:1.2.3.4;lr>", where "1.2.3.4" is the address of the outgoing + This function is used to insert a Path header in the form “Path: + <sip:1.2.3.4;lr>”, where “1.2.3.4” is the address of the outgoing interface. + If the “outbound” module was loaded before this module, and outbound is + required for this request, the header will be in the form “Path: + <sip:flowtoken@1.2.3.4;lr;ob>”, where “flowtoken” is the RFC 5636 + flow-token that can be used to identify the source and local address + and transport the request was received on, and where “1.2.3.4” is the + address of the outgoing interface. + This function can be used from REQUEST_ROUTE. Example 1.2. add_path usage @@ -168,10 +177,10 @@ if (!add_path()) { }; ... -4.2. add_path(user) +4.2. add_path(user) - This function adds a Path header in the form "Path: - <sip:user@1.2.3.4;lr>". + This function adds a Path header in the form “Path: + <sip:user@1.2.3.4;lr>”. Meaning of the parameters is as follows: * user - The username to be inserted as user part. @@ -186,10 +195,10 @@ if (!add_path("loadbalancer")) { }; ... -4.3. add_path_received() +4.3. add_path_received() - This function adds a Path header in the form "Path: - <sip:1.2.3.4;received=sip:2.3.4.5:1234;lr>", setting it's own outgoing + This function adds a Path header in the form “Path: + <sip:1.2.3.4;received=sip:2.3.4.5:1234;lr>”, setting it's own outgoing address as domain-part, and the address the request has been received from as received-parameter. @@ -203,10 +212,10 @@ if (!add_path_received()) { }; ... -4.4. add_path_received(user) +4.4. add_path_received(user) - This function adds a Path header in the form "Path: - <sip:user@1.2.3.4;received=sip:2.3.4.5:1234;lr>", setting 'user' as + This function adds a Path header in the form “Path: + <sip:user@1.2.3.4;received=sip:2.3.4.5:1234;lr>”, setting 'user' as username part of address, it's own outgoing address as domain-part, and the address the request has been received from as received-parameter. diff --git a/modules_k/path/doc/path_admin.xml b/modules_k/path/doc/path_admin.xml index b0fd913..d68e360 100644 --- a/modules_k/path/doc/path_admin.xml +++ b/modules_k/path/doc/path_admin.xml @@ -87,6 +87,11 @@ parameter. </para> </listitem> + <listitem> + <para> + The "outbound" module is needed for outbound routing as per RFC 5626. + </para> + </listitem> </itemizedlist> </para> </section> @@ -142,6 +147,14 @@ modparam("path", "use_received", 1) of the outgoing interface. </para> <para> + If the <quote>outbound</quote> module was loaded before this module, and outbound is + required for this request, the header will be in the form + <quote>Path: <sip:flowtoken@1.2.3.4;lr;ob></quote>, where <quote>flowtoken</quote> + is the RFC 5636 flow-token that can be used to identify the source and local address and + transport the request was received on, and where <quote>1.2.3.4</quote> is the address of + the outgoing interface. + </para> + <para> This function can be used from REQUEST_ROUTE. </para> <example>

1 0

git:pd/outbound: modules_k/outbound: Added some includes to api.h
by Peter Dunkley 26 Dec '12

26 Dec '12

Module: sip-router Branch: pd/outbound Commit: a1501f0b44975057e752d0337fb074ed53fd6a54 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1501f0… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Dec 26 14:15:18 2012 +0000 modules_k/outbound: Added some includes to api.h --- modules_k/outbound/api.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/outbound/api.h b/modules_k/outbound/api.h index 86f17b3..90e70ef 100644 --- a/modules_k/outbound/api.h +++ b/modules_k/outbound/api.h @@ -24,6 +24,9 @@ #ifndef OB_API_H #define OB_API_H +#include "../../str.h" +#include "../../sr_module.h" + typedef int (*encode_flow_token_t)(str *, struct receive_info); typedef int (*decode_flow_token_t)(struct receive_info *, str); typedef int (*use_outbound_t)(struct sip_msg *);

1 0

git:master: core: extended xavp api
by Daniel-Constantin Mierla 26 Dec '12

26 Dec '12

Module: sip-router Branch: master Commit: 6f31c603d1e540b1cd7ca7e81648e024acbd1388 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f31c60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 24 10:02:01 2012 +0100 core: extended xavp api - functions to add an avp last in a list or inserted at a specific position, to extract an avp from top of the list --- xavp.c | 216 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ xavp.h | 7 ++ 2 files changed, 223 insertions(+), 0 deletions(-) diff --git a/xavp.c b/xavp.c index 97b545d..f04ac90 100644 --- a/xavp.c +++ b/xavp.c @@ -113,6 +113,56 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) return avp; } +int xavp_add(sr_xavp_t *xavp, sr_xavp_t **list) +{ + if (xavp==NULL) + return -1; + /* Prepend new xavp to the list */ + if(list) { + xavp->next = *list; + *list = xavp; + } else { + xavp->next = *_xavp_list_crt; + *_xavp_list_crt = xavp; + } + + return 0; +} + +int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list) +{ + sr_xavp_t *prev; + sr_xavp_t *crt; + + if (xavp==NULL) + return -1; + + crt = xavp_get_internal(&xavp->name, list, 0, 0); + + prev = NULL; + + while(crt) { + prev = crt; + crt = xavp_get_next(prev); + } + + if(prev==NULL) { + /* Prepend new xavp to the list */ + if(list) { + xavp->next = *list; + *list = xavp; + } else { + xavp->next = *_xavp_list_crt; + *_xavp_list_crt = xavp; + } + } else { + xavp->next = prev->next; + prev->next = xavp; + } + + return 0; +} + sr_xavp_t *xavp_add_value(str *name, sr_xval_t *val, sr_xavp_t **list) { sr_xavp_t *avp=0; @@ -454,4 +504,170 @@ void xavp_print_list(sr_xavp_t **head) { xavp_print_list_content(head, 0); } + +/** + * clone the xavp without values that are custom data + * - only one list level is cloned, other sublists are ignored + */ +sr_xavp_t *xavp_clone_level_nodata(sr_xavp_t *xold) +{ + sr_xavp_t *xnew = NULL; + sr_xavp_t *navp = NULL; + sr_xavp_t *oavp = NULL; + sr_xavp_t *pavp = NULL; + + if(xold == NULL) + return NULL; + if(xold->val.type==SR_XTYPE_DATA) + { + LM_INFO("xavp value type is 'data' - ignoring in clone\n"); + return NULL; + } + xnew = xavp_new_value(&xold->name, &xold->val); + if(xnew==NULL) + { + LM_ERR("cannot create cloned root xavp\n"); + return NULL; + } + + if(xold->val.type!=SR_XTYPE_XAVP) + return xnew; + + xnew->val.v.xavp = NULL; + oavp = xold->val.v.xavp; + + while(oavp) + { + if(xold->val.type!=SR_XTYPE_DATA && xold->val.type!=SR_XTYPE_XAVP) + { + navp = xavp_new_value(&oavp->name, &oavp->val); + if(navp==NULL) + { + if(xnew->val.v.xavp == NULL) + { + shm_free(xnew); + return NULL; + } else { + xavp_destroy_list(&navp); + return NULL; + } + } + if(xnew->val.v.xavp == NULL) + { + /* link to val in head xavp */ + xnew->val.v.xavp = navp; + pavp = navp; + } else { + /* link to prev xavp in the list */ + pavp->next = navp; + } + } + oavp = oavp->next; + } + + if(xnew->val.v.xavp == NULL) + { + shm_free(xnew); + return NULL; + } + + return xnew; +} + +int xavp_insert(sr_xavp_t *xavp, int idx, sr_xavp_t **list) +{ + sr_xavp_t *crt = 0; + sr_xavp_t *fst = 0; + sr_xavp_t *lst = 0; + sr_xval_t val; + int n = 0; + int i = 0; + + if(idx==0) + return xavp_add(xavp, list); + + crt = xavp_get_internal(&xavp->name, list, 0, 0); + while(crt!=NULL && n<idx) { + lst = crt; + n++; + crt = xavp_get_next(lst); + } + memset(&val, 0, sizeof(sr_xval_t)); + val.type = SR_XTYPE_NULL; + for(i=0; i<idx-n; i++) { + crt = xavp_add_value(&xavp->name, &val, list); + if(crt==NULL) + return -1; + if(fst==NULL) + fst = crt; + if(lst==NULL) { + if(xavp_add(crt, list)<0) + return -1; + } else { + crt->next = lst->next; + lst->next = crt; + } + } + + if(fst==NULL) { + return xavp_add(xavp, list); + } else { + xavp->next = fst->next; + fst->next = xavp; + } + + return 0; +} + +sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list) +{ + sr_xavp_t *avp = 0; + sr_xavp_t *foo; + sr_xavp_t *prv = 0; + unsigned int id; + + if(name==NULL || name->s==NULL) { + if(list!=NULL) { + avp = *list; + if(avp!=NULL) { + *list = avp->next; + avp->next = NULL; + } + } else { + avp = *_xavp_list_crt; + if(avp!=NULL) { + *_xavp_list_crt = avp->next; + avp->next = NULL; + } + } + + return avp; + } + + id = get_hash1_raw(name->s, name->len); + if(list!=NULL) + avp = *list; + else + avp = *_xavp_list_crt; + while(avp) + { + foo = avp; + avp=avp->next; + if(foo->id==id && foo->name.len==name->len + && strncmp(foo->name.s, name->s, name->len)==0) + { + if(prv!=NULL) + prv->next=foo->next; + else if(list!=NULL) + *list = foo->next; + else + *_xavp_list_crt = foo->next; + foo->next = NULL; + return foo; + } else { + prv = foo; + } + } + return NULL; +} #endif diff --git a/xavp.h b/xavp.h index 979bee4..0ffce2a 100644 --- a/xavp.h +++ b/xavp.h @@ -78,6 +78,8 @@ typedef struct _sr_xavp { int xavp_init_head(void); void avpx_free(sr_xavp_t *xa); +int xavp_add(sr_xavp_t *xavp, sr_xavp_t **list); +int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list); sr_xavp_t *xavp_add_value(str *name, sr_xval_t *val, sr_xavp_t **list); sr_xavp_t *xavp_set_value(str *name, int idx, sr_xval_t *val, sr_xavp_t **list); sr_xavp_t *xavp_get(str *name, sr_xavp_t *start); @@ -93,7 +95,12 @@ void xavp_reset_list(void); sr_xavp_t **xavp_set_list(sr_xavp_t **head); sr_xavp_t **xavp_get_crt_list(void); +int xavp_insert(sr_xavp_t *xavp, int idx, sr_xavp_t **list); +sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list); + void xavp_print_list(sr_xavp_t **head); + +sr_xavp_t *xavp_clone_level_nodata(sr_xavp_t *xold); #endif #endif

2 1

resolve error
by Juha Heinanen 26 Dec '12

26 Dec '12

when my proxy tries to serve tm.t_uac_wait xmlrpc request, i get this to syslog: ERROR: sip_hostport2su: could not resolve hostname: "127.0.0.1" Dec 26 10:02:24 sip /usr/sbin/sip-proxy[29157]: ERROR: tm [ut.h:337]: failed to resolve "127.0.0.1" Dec 26 10:02:24 sip /usr/sbin/sip-proxy[29157]: ERROR: tm [rpc_uac.c:197]: ERROR: get_hfblock: send_sock failed i don't remember getting these earlier. could it have something to do with recent changes in resolve.h? -- juha

2 3

git:master: core: check for IP in no_naptr_srv_sip_resolvehost()
by Daniel-Constantin Mierla 26 Dec '12

26 Dec '12

Module: sip-router Branch: master Commit: b2e5040fa324fa8c95c5b44a5fcab58ed84a4c55 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b2e5040… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 26 12:32:00 2012 +0100 core: check for IP in no_naptr_srv_sip_resolvehost() - catch IP addresses before attempting to do SRV query --- resolve.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/resolve.c b/resolve.c index 2a690a4..0a77ed7 100644 --- a/resolve.c +++ b/resolve.c @@ -1462,6 +1462,7 @@ struct hostent* no_naptr_srv_sip_resolvehost(str* name, unsigned short* port, ch int proto_pref; } srv_proto_list[PROTO_LAST], tmp_srv_element; struct hostent* he; + struct ip_addr* ip; str srv_name; static char tmp_srv[MAX_DNS_NAME]; /* tmp. buff. for SRV lookups */ int len; @@ -1470,6 +1471,23 @@ struct hostent* no_naptr_srv_sip_resolvehost(str* name, unsigned short* port, ch he=0; len=0; + /* check if it's an ip address */ + if (((ip=str2ip(name))!=0) +#ifdef USE_IPV6 + || ((ip=str2ip6(name))!=0) +#endif + ){ + /* we are lucky, this is an ip address */ + /* set proto if needed - default udp */ + if ((proto)&&(*proto==PROTO_NONE)) + *proto=PROTO_UDP; + /* set port if needed - default 5060/5061 */ + if ((port)&&(*port==0)) + *port=((proto) && (*proto==PROTO_TLS))?SIPS_PORT:SIP_PORT; + he=ip_addr2he(name, ip); + return he; + } + if ((name->len+SRV_MAX_PREFIX_LEN+1)>MAX_DNS_NAME){ LOG(L_WARN, "WARNING: no_naptr_srv_sip_resolvehost: domain name too long" " (%d), unable to perform SRV lookup\n", name->len);

1 0

git:master: core: try all srv protocols when not already set
by Daniel-Constantin Mierla 26 Dec '12

26 Dec '12

Module: sip-router Branch: master Commit: 17b3c70ea9cd21b71b44062dfff20cea7e67b349 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=17b3c70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 26 11:20:46 2012 +0100 core: try all srv protocols when not already set - patch to commit by Mihály Mészáros --- resolve.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/resolve.c b/resolve.c index 34d4ff8..2a690a4 100644 --- a/resolve.c +++ b/resolve.c @@ -1475,7 +1475,7 @@ struct hostent* no_naptr_srv_sip_resolvehost(str* name, unsigned short* port, ch " (%d), unable to perform SRV lookup\n", name->len); } else { /* if proto available, then add only the forced protocol to the list */ - if (proto && *proto==0){ + if (proto && *proto!=PROTO_NONE){ srv_proto_list[0].proto=*proto; list_len=1; } else {

1 0

How to extend SNMPStats module
by 马天 26 Dec '12

26 Dec '12

Hi all, Merry X'mas. I'm working on a project which uses kamailio as sip server. Since I'm really new to kamailio and sip protocool and c, I need some help.My question is that is it possible to extend snmpstats module so the snmpstats module can respond to customized oid.I already wrote the mib file and generated the corresponding c files which handle the request. But I couldn't compile it into snmpstats module.Always get a "No Such Object available on this agent at this OID" when i send GET request using snmpget.Thanks. Regards, Sebastian

1 0

Merry Christmas!
by Daniel-Constantin Mierla 25 Dec '12

25 Dec '12

Another year getting to its end! Looking back, looks like one with the greatest achievements in the development of the project so far. Year is not done, so I save that summary for one week later, there is still stuff on its way to our source code repository. Now I want to thank to everyone promoting and contributing to the project, from developers to community members, and wish Merry Christmas and great winter holidays to all supporters of our project! Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com http://linkedin.com/in/miconda -- http://twitter.com/miconda

5 4

git:master: registrar(k): restore the location contact xavp upon lookup
by Daniel-Constantin Mierla 24 Dec '12

24 Dec '12

Module: sip-router Branch: master Commit: b21b5125c7c60775226a7a86dc411863477ed799 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b21b512… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 24 10:04:15 2012 +0100 registrar(k): restore the location contact xavp upon lookup --- modules_k/registrar/lookup.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index e3553db..91ccb8e 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -266,8 +266,8 @@ int lookup(struct sip_msg* _m, udomain_t* _d, str* _uri) if (ptr->instance.len) { if (set_instance(_m, &(ptr->instance)) < 0) { - ret = -3; - goto done; + ret = -3; + goto done; } } @@ -282,6 +282,13 @@ int lookup(struct sip_msg* _m, udomain_t* _d, str* _uri) if (ptr->sock) set_force_socket(_m, ptr->sock); + if(ptr->xavp!=NULL) { + xavp = xavp_clone_level_nodata(ptr->xavp); + if(xavp_add(xavp, NULL)<0) { + ret = -3; + goto done; + } + } ptr = ptr->next; } @@ -315,6 +322,13 @@ int lookup(struct sip_msg* _m, udomain_t* _d, str* _uri) /* Also give a chance to the next branches*/ continue; } + if(ptr->xavp!=NULL) { + xavp = xavp_clone_level_nodata(ptr->xavp); + if(xavp_insert(xavp, nr_branches, NULL)<0) { + ret = -3; + goto done; + } + } } }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2012