sr-dev October 2016

sr-dev@lists.kamailio.org

28 participants
234 discussions

git:4.4:19b4c38c: core: defined macro for CRLFCRLF

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 19b4c38c9612e88cb8664fd21c98d86bb78b71b6 URL: https://github.com/kamailio/kamailio/commit/19b4c38c9612e88cb8664fd21c98d86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-10T12:16:01+02:00 core: defined macro for CRLFCRLF - used in pinging over tcp, makes it more coherent to use (cherry picked from commit 6649cdf51520cfcc366f2839316c8d45c233421b) --- Modified: config.h --- Diff: https://github.com/kamailio/kamailio/commit/19b4c38c9612e88cb8664fd21c98d86… Patch: https://github.com/kamailio/kamailio/commit/19b4c38c9612e88cb8664fd21c98d86… --- diff --git a/config.h b/config.h index 4083099..66ba0df 100644 --- a/config.h +++ b/config.h @@ -90,13 +90,16 @@ #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1) #define MAX_WARNING_LEN 256 - + #define MY_BRANCH ";branch=" #define MY_BRANCH_LEN (sizeof(MY_BRANCH) - 1) #define MAX_PORT_LEN 7 /* ':' + max 5 letters + \0 */ + #define CRLF "\r\n" #define CRLF_LEN (sizeof(CRLF) - 1) +#define CRLFCRLF "\r\n\r\n" +#define CRLFCRLF_LEN (sizeof(CRLFCRLF) - 1) #define RECEIVED ";received=" #define RECEIVED_LEN (sizeof(RECEIVED) - 1)

7 years, 7 months

git:4.4:41806a15: presence: fix crush if dialog id is NULL

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 41806a15be4dfb99a2b4c708ffe521bc6ea53326 URL: https://github.com/kamailio/kamailio/commit/41806a15be4dfb99a2b4c708ffe521b… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-10T12:15:42+02:00 presence: fix crush if dialog id is NULL - check dialog_id is not NULL before call delete_presentity_if_dialog_id_exists (cherry picked from commit d68d01262e59593e7976afea1b1c458815448e7a) --- Modified: modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/41806a15be4dfb99a2b4c708ffe521b… Patch: https://github.com/kamailio/kamailio/commit/41806a15be4dfb99a2b4c708ffe521b… --- diff --git a/modules/presence/presentity.c b/modules/presence/presentity.c index 00fdbfd..cb819cf 100644 --- a/modules/presence/presentity.c +++ b/modules/presence/presentity.c @@ -691,7 +691,7 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, } check_if_dialog(*body, &is_dialog, &dialog_id); - if (is_dialog == 1) { + if ( dialog_id ) { if (delete_presentity_if_dialog_id_exists(presentity, dialog_id) < 0) { goto error; }

7 years, 7 months

git:4.4:a45e9f67: websocket: handle CRLF received inside a frame (as SIP layer ping)

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: a45e9f67482e896ef83c061e3816af2ca0be5896 URL: https://github.com/kamailio/kamailio/commit/a45e9f67482e896ef83c061e3816af2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-10T12:15:07+02:00 websocket: handle CRLF received inside a frame (as SIP layer ping) - reported by AndrÃ© Freitas, GH #810 (cherry picked from commit 585c60f2cdbf4199b749f74fe795ec583ae9f99c) --- Modified: modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/a45e9f67482e896ef83c061e3816af2… Patch: https://github.com/kamailio/kamailio/commit/a45e9f67482e896ef83c061e3816af2… --- diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index 16f7901..e8653eb 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -136,6 +136,8 @@ static str str_status_error_closing = str_init("Error closing connection"); static str str_status_error_sending = str_init("Error sending frame"); static str str_status_string_error = str_init("Error converting string to int"); +static int ws_send_crlf(ws_connection_t *wsc, int opcode); + static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) { int pos = 0, extended_length; @@ -680,10 +682,17 @@ int ws_frame_receive(void *data) case OPCODE_BINARY_FRAME: if (likely(frame.wsc->sub_protocol == SUB_PROTOCOL_SIP)) { - LM_DBG("Rx SIP message:\n%.*s\n", frame.payload_len, + LM_DBG("Rx SIP (or text) message:\n%.*s\n", frame.payload_len, frame.payload_data); update_stat(ws_sip_received_frames, 1); + if(frame.payload_len==CRLF_LEN + && strncmp(frame.payload_data, CRLF, CRLF_LEN)==0) + { + ws_send_crlf(frame.wsc, opcode); + wsconn_put(frame.wsc); + return 0; + } if (frame.fin) { @@ -788,7 +797,7 @@ int ws_frame_transmit(void *data) frame.payload_data); if (encode_and_send_ws_frame(&frame, CONN_CLOSE_DONT) < 0) - { + { LM_ERR("sending message\n"); wsconn_put(frame.wsc); @@ -813,7 +822,7 @@ static int ping_pong(ws_connection_t *wsc, int opcode) frame.wsc = wsc; if (encode_and_send_ws_frame(&frame, CONN_CLOSE_DONT) < 0) - { + { LM_ERR("sending keepalive\n"); return -1; } @@ -824,6 +833,25 @@ static int ping_pong(ws_connection_t *wsc, int opcode) return 0; } +static int ws_send_crlf(ws_connection_t *wsc, int opcode) +{ + ws_frame_t frame; + + memset(&frame, 0, sizeof(frame)); + frame.fin = 1; + frame.opcode = opcode; + frame.payload_len = CRLF_LEN; + frame.payload_data = CRLF; + frame.wsc = wsc; + + if (encode_and_send_ws_frame(&frame, CONN_CLOSE_DONT) < 0) { + LM_ERR("failed sending CRLF\n"); + return -1; + } + + return 0; +} + struct mi_root *ws_mi_close(struct mi_root *cmd, void *param) { unsigned int id;

7 years, 7 months

git:4.4:28e622cf: core: print sip message on error related to missing body

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 28e622cf15b3fb220b5d02e3ad237417bdaaa66c URL: https://github.com/kamailio/kamailio/commit/28e622cf15b3fb220b5d02e3ad23741… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-10T12:13:29+02:00 core: print sip message on error related to missing body (cherry picked from commit 1ed9c2712fcfaf378875bc7e478b9481013841d4) --- Modified: msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/28e622cf15b3fb220b5d02e3ad23741… Patch: https://github.com/kamailio/kamailio/commit/28e622cf15b3fb220b5d02e3ad23741… --- diff --git a/msg_translator.c b/msg_translator.c index 9441717..7130efe 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -400,7 +400,7 @@ char* id_builder(struct sip_msg* msg, unsigned int *id_len) -char* clen_builder( struct sip_msg* msg, int *clen_len, int diff, +char* clen_builder( struct sip_msg* msg, int *clen_len, int diff, int body_only) { char* buf; @@ -414,7 +414,8 @@ char* clen_builder( struct sip_msg* msg, int *clen_len, int diff, body=get_body(msg); if (body==0){ ser_error=E_BAD_REQ; - LM_ERR("no message body found (missing crlf?)"); + LM_ERR("no message body found (missing crlf?) [[%.*s]]\n", + msg->len, msg->buf); return 0; } value=msg->len-(int)(body-msg->buf)+diff;

7 years, 7 months

git:4.4:65cb4a63: core: rely on msg->last_header to get the anchor inside sr_hdr_add()

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 65cb4a63c572260bcdc96a84a421c66cf3086dcb URL: https://github.com/kamailio/kamailio/commit/65cb4a63c572260bcdc96a84a421c66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-10T12:13:15+02:00 core: rely on msg->last_header to get the anchor inside sr_hdr_add() - might fix GH #789 (cherry picked from commit 9483b5491f82dd18bbdaeee72fd43ec6e1fbfb8c) --- Modified: data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/65cb4a63c572260bcdc96a84a421c66… Patch: https://github.com/kamailio/kamailio/commit/65cb4a63c572260bcdc96a84a421c66… --- diff --git a/data_lump.c b/data_lump.c index 5d085ec..5b87b8e 100644 --- a/data_lump.c +++ b/data_lump.c @@ -743,13 +743,19 @@ int sr_hdr_add(sip_msg_t *msg, str *sname, str *sbody) struct lump* anchor; str h; + parse_headers(msg, HDR_EOH_F, 0); + if(msg->last_header == 0) { + LM_ERR("failed to parse headers\n"); + return -1; + } h.len = sname->len + 2 + sbody->len + CRLF_LEN; h.s = (char*)pkg_malloc(h.len+1); if(h.s == 0) { LM_ERR("no more pkg\n"); return -1; } - anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0); + anchor = anchor_lump(msg, msg->last_header->name.s + msg->last_header->len + - msg->buf, 0, 0); if(anchor == 0) { LM_ERR("cannot get the anchor\n");

7 years, 7 months

git:4.4:fad61c4b: utils: coherent indentation for xcap functions

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: fad61c4b4e3c3b4430ac9f4d05cb3698f39c1c0c URL: https://github.com/kamailio/kamailio/commit/fad61c4b4e3c3b4430ac9f4d05cb369… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-10T12:12:30+02:00 utils: coherent indentation for xcap functions - fix for gcc 6.2 misleading blocks warnings (cherry picked from commit 883629aecc143528396fae0f88d434bfc0a047ca) --- Modified: modules/utils/xcap_auth.c --- Diff: https://github.com/kamailio/kamailio/commit/fad61c4b4e3c3b4430ac9f4d05cb369… Patch: https://github.com/kamailio/kamailio/commit/fad61c4b4e3c3b4430ac9f4d05cb369…

7 years, 7 months

git:4.4:3a32d65b: counters: fixed rpc command to get counter by group and name

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 3a32d65bbe103ea0caae418b946168ce774948c5 URL: https://github.com/kamailio/kamailio/commit/3a32d65bbe103ea0caae418b946168c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-10T12:12:04+02:00 counters: fixed rpc command to get counter by group and name (cherry picked from commit f8e47835950fa472ef313b7f303b0989b76f9dbe) --- Modified: modules/counters/counters.c --- Diff: https://github.com/kamailio/kamailio/commit/3a32d65bbe103ea0caae418b946168c… Patch: https://github.com/kamailio/kamailio/commit/3a32d65bbe103ea0caae418b946168c… --- diff --git a/modules/counters/counters.c b/modules/counters/counters.c index d90ead1..5fd8739 100644 --- a/modules/counters/counters.c +++ b/modules/counters/counters.c @@ -24,9 +24,9 @@ /*! * \defgroup counters Counters/statistics - * + * */ - + #include "../../modparam.h" #include "../../dprint.h" #include "../../compiler_opt.h" @@ -239,7 +239,7 @@ static int cnt_int_fixup(void** param, int param_no) static int cnt_inc_f(struct sip_msg* msg, char* handle, char* bar) { counter_handle_t h; - + h.id = (long)(void*)handle; counter_inc(h); return 1; @@ -251,7 +251,7 @@ static int cnt_add_f(struct sip_msg* msg, char* handle, char* val) { counter_handle_t h; int v; - + h.id = (long)(void*)handle; if (unlikely(get_int_fparam(&v, msg, (fparam_t*)val) < 0)) { ERR("non integer parameter\n"); @@ -266,7 +266,7 @@ static int cnt_add_f(struct sip_msg* msg, char* handle, char* val) static int cnt_reset_f(struct sip_msg* msg, char* handle, char* bar) { counter_handle_t h; - + h.id = (long)(void*)handle; counter_reset(h); return 1; @@ -284,12 +284,13 @@ static void cnt_get_rpc(rpc_t* rpc, void* c) char* name; counter_val_t v; counter_handle_t h; - + if (rpc->scan(c, "s", &group) < 1) return; - if (rpc->scan(c, "*s", &name) < 1) + if (rpc->scan(c, "*s", &name) < 1) { cnt_grp_get_all(rpc, c, group); return; + } /* group & name read */ if (counter_lookup(&h, group, name) < 0) { rpc->fault(c, 400, "non-existent counter %s.%s\n", group, name); @@ -308,7 +309,7 @@ static void cnt_get_raw_rpc(rpc_t* rpc, void* c) char* name; counter_val_t v; counter_handle_t h; - + if (rpc->scan(c, "ss", &group, &name) < 2) { /* rpc->fault(c, 400, "group and counter name required"); */ return; @@ -329,7 +330,7 @@ static void cnt_reset_rpc(rpc_t* rpc, void* c) char* group; char* name; counter_handle_t h; - + if (rpc->scan(c, "ss", &group, &name) < 2) { /* rpc->fault(c, 400, "group and counter name required"); */ return; @@ -383,7 +384,7 @@ static void rpc_print_name_val(void* param, str* g, str* n, static void cnt_grps_list_rpc(rpc_t* rpc, void* c) { struct rpc_list_params packed_params; - + packed_params.rpc = rpc; packed_params.ctx = c; counter_iterate_grp_names(rpc_print_name, &packed_params); @@ -395,7 +396,7 @@ static void cnt_var_list_rpc(rpc_t* rpc, void* c) { char* group; struct rpc_list_params packed_params; - + if (rpc->scan(c, "s", &group) < 1) { /* rpc->fault(c, 400, "group name required"); */ return; @@ -411,7 +412,7 @@ static void cnt_grp_get_all(rpc_t* rpc, void* c, char* group) { void* s; struct rpc_list_params packed_params; - + if (rpc->add(c, "{", &s) < 0) return; packed_params.rpc = rpc; packed_params.ctx = s; @@ -423,7 +424,7 @@ static void cnt_grp_get_all(rpc_t* rpc, void* c, char* group) static void cnt_grp_get_all_rpc(rpc_t* rpc, void* c) { char* group; - + if (rpc->scan(c, "s", &group) < 1) { /* rpc->fault(c, 400, "group name required"); */ return; @@ -439,7 +440,7 @@ static void cnt_help_rpc(rpc_t* rpc, void* ctx) char* name; char* desc; counter_handle_t h; - + if (rpc->scan(ctx, "ss", &group, &name) < 2) { /* rpc->fault(c, 400, "group and counter name required"); */ return;

7 years, 7 months

git:4.4:2372150f: auth_identity: fix misleading indentation level

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 2372150f292363fd8c1705dfd69184e9a898f86a URL: https://github.com/kamailio/kamailio/commit/2372150f292363fd8c1705dfd69184e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-10T12:11:12+02:00 auth_identity: fix misleading indentation level (cherry picked from commit e5532f05d7b2b6b8d90d01fd9e934a412c7168e0) --- Modified: modules/auth_identity/auth_hdrs.c --- Diff: https://github.com/kamailio/kamailio/commit/2372150f292363fd8c1705dfd69184e… Patch: https://github.com/kamailio/kamailio/commit/2372150f292363fd8c1705dfd69184e… --- diff --git a/modules/auth_identity/auth_hdrs.c b/modules/auth_identity/auth_hdrs.c index 06a773b..a5099b6 100644 --- a/modules/auth_identity/auth_hdrs.c +++ b/modules/auth_identity/auth_hdrs.c @@ -449,7 +449,7 @@ int digeststr_asm(dynstr *sout, struct sip_msg *msg, str *sdate, int iflags) /* there was an error or the required header is missing */ if (iRes==AUTH_ERROR - || (iRes==AUTH_NOTFOUND && (pactpart[i1].iflag & DS_REQUIRED))) + || (iRes==AUTH_NOTFOUND && (pactpart[i1].iflag & DS_REQUIRED))) return -1; switch (pactpart[i1].itype) { @@ -569,10 +569,12 @@ int append_date(str *sdate, int idatesize, time_t *tout, struct sip_msg *msg) if (sdate && idatesize >= ilen) { memcpy(sdate->s, date_str, ilen); sdate->len=ilen; - } else + } else { return -5; - if (tout) - *tout=tdate_now; + } + + if (tout) + *tout=tdate_now; return 0; } @@ -667,24 +669,24 @@ static char *auth_get_hf_name(char *begin, char *end, enum _hdr_types_t *type) goto other; } else { return (p + 1); - } + } /* Unknown header type */ other: p = q_memchr(p, ':', end - p); - if (!p) { /* No double colon found, error.. */ + if (!p) { /* No double colon found, error.. */ *type = HDR_ERROR_T; return 0; - } else { + } else { *type = HDR_OTHER_T; return (p + 1); - } + } return p; } /* parses buffer that contains a SIP message header, looks for "Contact" - header field and returns the value of that */ + * header field and returns the value of that */ static int get_contact_body(char *buf, unsigned int len, str *sout) { char *end, *s, *tmp, *match;

7 years, 7 months

git:4.4:c0f42840: core: ut - fix misleading indentation for IF blocks

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: c0f428406a8ccc7fbbd910150e4d45a6addbae49 URL: https://github.com/kamailio/kamailio/commit/c0f428406a8ccc7fbbd910150e4d45a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-10T12:10:48+02:00 core: ut - fix misleading indentation for IF blocks - reported by latest gcc on debian sid (cherry picked from commit b7aa4b2cac495397f36fecb2e5bd5a0b80844346) --- Modified: ut.c --- Diff: https://github.com/kamailio/kamailio/commit/c0f428406a8ccc7fbbd910150e4d45a… Patch: https://github.com/kamailio/kamailio/commit/c0f428406a8ccc7fbbd910150e4d45a… --- diff --git a/ut.c b/ut.c index 71907b4..9856b72 100644 --- a/ut.c +++ b/ut.c @@ -47,7 +47,7 @@ int user2uid(int* uid, int* gid, char* user) { char* tmp; struct passwd *pw_entry; - + if (user){ *uid=strtol(user, &tmp, 10); if ((tmp==0) ||(*tmp)){ @@ -73,7 +73,7 @@ int group2gid(int* gid, char* group) { char* tmp; struct group *gr_entry; - + if (group){ *gid=strtol(group, &tmp, 10); if ((tmp==0) ||(*tmp)){ @@ -93,7 +93,7 @@ int group2gid(int* gid, char* group) /* * Replacement of timegm (does not exists on all platforms - * Taken from + * Taken from * http://lists.samba.org/archive/samba-technical/2002-November/025737.html */ time_t _timegm(struct tm* t) @@ -111,7 +111,7 @@ time_t _timegm(struct tm* t) } tl += 3600; } - + tg = gmtime(&tl); tg->tm_isdst = 0; tb = mktime(tg); @@ -173,7 +173,7 @@ char* as_asciiz(str* s) /* return system version (major.minor.minor2) as * (major<<16)|(minor)<<8|(minor2) * (if some of them are missing, they are set to 0) - * if the parameters are not null they are set to the coresp. part + * if the parameters are not null they are set to the coresp. part */ unsigned int get_sys_version(int* major, int* minor, int* minor2) { @@ -182,7 +182,7 @@ unsigned int get_sys_version(int* major, int* minor, int* minor2) int m2; int m3; char* p; - + memset (&un, 0, sizeof(un)); m1=m2=m3=0; /* get sys version */ @@ -218,24 +218,24 @@ char* get_abs_pathname(str* base, str* file) str ser_cfg; char* buf, *dir, *res; int len; - + if (base == NULL) { ser_cfg.s = cfg_file; ser_cfg.len = strlen(cfg_file); base = &ser_cfg; } - + if (!base->s || base->len <= 0 || base->s[0] != '/') { BUG("get_abs_pathname: Base file must be absolute pathname: " "'%.*s'\n", STR_FMT(base)); return NULL; } - + if (!file || !file->s || file->len <= 0) { BUG("get_abs_pathname: Invalid 'file' parameter\n"); return NULL; } - + if (file->s[0] == '/') { /* This is an absolute pathname, make a zero terminated * copy and use it as it is */ @@ -257,7 +257,7 @@ char* get_abs_pathname(str* base, str* file) memcpy(buf, base->s, base->len); buf[base->len]=0; dir = dirname(buf); - + len = strlen(dir); if ((res = pkg_malloc(len + 1 + file->len + 1)) == NULL) { ERR("get_abs_pathname: No memory left (pkg_malloc failed)\n"); @@ -321,7 +321,7 @@ void * ser_memmem(const void *b1, const void *b2, size_t len1, size_t len2) if (memcmp(sp, pp, len2) == 0) return sp; - sp++; + sp++; } return NULL; @@ -352,7 +352,7 @@ void * ser_memrmem(const void *b1, const void *b2, size_t len1, size_t len2) if (memcmp(sp, pp, len2) == 0) return sp; - sp--; + sp--; } return NULL;

7 years, 7 months

git:4.4:11971cbb: core: proper code block when saving chosen naptr record

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 11971cbb21f9e7cface65251e7a991ffe8c9efc5 URL: https://github.com/kamailio/kamailio/commit/11971cbb21f9e7cface65251e7a991f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-10T12:10:33+02:00 core: proper code block when saving chosen naptr record (cherry picked from commit a4b43f962a4493defb3fd608d1d2fad3ee58794a) --- Modified: resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/11971cbb21f9e7cface65251e7a991f… Patch: https://github.com/kamailio/kamailio/commit/11971cbb21f9e7cface65251e7a991f… --- diff --git a/resolve.c b/resolve.c index 0af1be3..3d57418 100644 --- a/resolve.c +++ b/resolve.c @@ -1335,7 +1335,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, -#ifdef USE_NAPTR +#ifdef USE_NAPTR /** iterates over a naptr rr list, returning each time a "good" naptr record @@ -1343,7 +1343,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, * params: * naptr_head - naptr rr list head * tried - bitmap used to keep track of the already tried records - * (no more then sizeof(tried)*8 valid records are + * (no more then sizeof(tried)*8 valid records are * ever walked * srv_name - if succesfull, it will be set to the selected record * srv name (naptr repl.) @@ -1351,10 +1351,10 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, * protocol * returns 0 if no more records found or a pointer to the selected record * and sets protocol and srv_name - * WARNING: when calling first time make sure you run first + * WARNING: when calling first time make sure you run first * naptr_iterate_init(&tried) */ -struct rdata* naptr_sip_iterate(struct rdata* naptr_head, +struct rdata* naptr_sip_iterate(struct rdata* naptr_head, naptr_bmp_t* tried, str* srv_name, char* proto) { @@ -1373,7 +1373,7 @@ struct rdata* naptr_sip_iterate(struct rdata* naptr_head, saved_proto=0; i=0; for(l=naptr_head; l && (i<MAX_NAPTR_RRS); l=l->next){ - if (l->type!=T_NAPTR) continue; + if (l->type!=T_NAPTR) continue; naptr=(struct naptr_rdata*) l->rdata; if (naptr==0){ LM_CRIT("null rdata\n"); @@ -1391,17 +1391,18 @@ struct rdata* naptr_sip_iterate(struct rdata* naptr_head, #endif if ((naptr_proto_supported(naptr_proto))){ if (naptr_choose(&naptr_saved, &saved_proto, - naptr, naptr_proto)) + naptr, naptr_proto)) { idx=i; l_saved=l; } + } i++; } if (naptr_saved){ /* found something */ #ifdef NAPTR_DBG LM_DBG("choosed NAPTR rr %.*s, proto %d tried: 0x%x\n", - naptr_saved->repl_len, + naptr_saved->repl_len, naptr_saved->repl, (int)saved_proto, *tried); #endif *tried|=1<<idx;

7 years, 7 months

← Newer
1
...
16
17
18
19
20
21
22
23
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2016