sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
527 discussions

git:5.2:566a853b: sanity: extended check 4 (required headers) for uniqueness

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 566a853be08fd52c13d1a7e7a0e630d5353941ec URL: https://github.com/kamailio/kamailio/commit/566a853be08fd52c13d1a7e7a0e630d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-12T10:49:36+02:00 sanity: extended check 4 (required headers) for uniqueness - Call-ID, CSeq, From and To have to be only once (cherry picked from commit a9ede56b35990fcc9164af0775f503e49e33377e) (cherry picked from commit 7adf410af754f1bb737edca6f427ef02d3441cda) (cherry picked from commit 5d5dd676d299a27f14c6079b497cf1ae311909ce) --- Modified: src/modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/566a853be08fd52c13d1a7e7a0e630d… Patch: https://github.com/kamailio/kamailio/commit/566a853be08fd52c13d1a7e7a0e630d… --- diff --git a/src/modules/sanity/sanity.c b/src/modules/sanity/sanity.c index 04ad2b86d6..842d394194 100644 --- a/src/modules/sanity/sanity.c +++ b/src/modules/sanity/sanity.c @@ -299,8 +299,21 @@ int check_ruri_scheme(sip_msg_t* msg) { return SANITY_CHECK_PASSED; } +#define SANITY_HDR_DUPCHECK(_hf, _hdr_flags, _hdr_type, _hdr_flag, _hdr_name) \ + do { \ + if((_hf)->type == _hdr_type) { \ + if(_hdr_flags & _hdr_flag) { \ + LM_DBG("duplicated %s header\n", _hdr_name); \ + return SANITY_CHECK_FAILED; \ + } \ + _hdr_flags |= _hdr_flag; \ + } \ + } while(0) + /* check for the presence of the minimal required headers */ int check_required_headers(sip_msg_t* msg) { + hdr_field_t* hf; + hdr_flags_t hdr_flags = 0; LM_DBG("check_required_headers entered\n"); @@ -309,6 +322,20 @@ int check_required_headers(sip_msg_t* msg) { LM_DBG("check_required_headers failed\n"); return SANITY_CHECK_FAILED; } + if (parse_headers(msg, HDR_EOH_F, 0) != 0) { + LM_ERR("failed to parse headers\n"); + if (sanity_reply(msg, 400, "Bad Headers") < 0) { + LM_WARN("failed to send 400 reply\n"); + } + return SANITY_CHECK_FAILED; + } + for (hf=msg->headers; hf; hf=hf->next) { + SANITY_HDR_DUPCHECK(hf, hdr_flags, HDR_FROM_T, HDR_FROM_F, "From"); + SANITY_HDR_DUPCHECK(hf, hdr_flags, HDR_TO_T, HDR_TO_F, "To"); + SANITY_HDR_DUPCHECK(hf, hdr_flags, HDR_CALLID_T, HDR_CALLID_F, "Call-Id"); + SANITY_HDR_DUPCHECK(hf, hdr_flags, HDR_CSEQ_T, HDR_CSEQ_F, "CSeq"); + } + /* TODO: check for other required headers according to request type */ LM_DBG("check_required_headers passed\n");

4 years, 2 months

git:5.2:b590ad0a: dialog: do unlock after saving updated dialog details

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: b590ad0aefbdcd6d76138d0b5f859ab6f4a2d882 URL: https://github.com/kamailio/kamailio/commit/b590ad0aefbdcd6d76138d0b5f859ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-12T10:49:23+02:00 dialog: do unlock after saving updated dialog details - lock()/unlock() for dialog slots are reentrant (cherry picked from commit e4cf6739e62c2ac1e5364315aaed1a7b73919253) (cherry picked from commit 73476522301b6de65b8873e4ab04041315e93a82) (cherry picked from commit 1cb4273aa67c588552b671a98a9edb15471df129) --- Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/b590ad0aefbdcd6d76138d0b5f859ab… Patch: https://github.com/kamailio/kamailio/commit/b590ad0aefbdcd6d76138d0b5f859ab… --- diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index fa9eae9d1f..b2a373a501 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -434,10 +434,11 @@ int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value /* unlock dialog */ if (dlg) { dlg->dflags |= DLG_FLAG_CHANGED_VARS; - dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); - if ( dlg_db_mode==DB_MODE_REALTIME ) + if ( dlg_db_mode==DB_MODE_REALTIME ) { + /* dlg_lock() / dlg_unlock() are reentrant */ update_dialog_dbinfo(dlg); - + } + dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); } print_lists(dlg);

4 years, 2 months

git:5.3:83f562f0: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.3 Commit: 83f562f0f0f2336e3cd26e54b5f337621775a6df URL: https://github.com/kamailio/kamailio/commit/83f562f0f0f2336e3cd26e54b5f3376… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-12T10:46:32+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/nathelper/README Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/83f562f0f0f2336e3cd26e54b5f3376… Patch: https://github.com/kamailio/kamailio/commit/83f562f0f0f2336e3cd26e54b5f3376… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 27d1e1c654..97b373eff3 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -521,16 +521,19 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; * flags - the value may be a bitwise OR of the following flags: + 0x01 - adds “a=direction:active” SDP line; + 0x02 - rewrite media IP address (c=) with source address of - the message or the provided IP address (the provide IP address - take precedence over the source address). + the message or the provided IP address. (a=rtpc) param will be + rewritten if exists. (the provided IP address take precedence + over the source address). + 0x04 - adds “a=nortpproxy:yes” SDP line; + 0x08 - rewrite IP from origin description (o=) with source - address of the message or the provided IP address (the provide - IP address take precedence over the source address). + address of the message or the provided IP address. (a=rtpc) + param will be rewritten if exists. (the provided IP address + take precedence over the source address). * ip_address - IP to be used for rewriting SDP. If not specified, the received signalling IP will be used. The parameter allows pseudo-variables usage. NOTE: For the IP to be used, you need to - use 0x02 or 0x08 flags, otherwise it will have no effect. + use 0x02 or 0x08 flags, otherwise it will have no effect. Must be + IPv4 address family. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE. diff --git a/src/modules/phonenum/README b/src/modules/phonenum/README index ebe872869b..096a3efa4b 100644 --- a/src/modules/phonenum/README +++ b/src/modules/phonenum/README @@ -161,6 +161,13 @@ if(phonenum_match("1-484-555-8888", "src")) { letter, e.g: "DE", "US", "ES"). The function has to be called before accessing a key via: $phn(pvc=>key). + Note from libphonenumber library docs: country name code is the region + that is expected the number to be from. It is only used if the number + being parsed is not written in international format. The country code + for the number in this case would be stored as that of the region + supplied. If the number is guaranteed to start with a '+' followed by + the country calling code, then region 'ZZ'. + The parameters can be static strings or strings with variables. It can be used from ANY_ROUTE.

4 years, 2 months

git:5.3:e58632ec: rtpproxy: renamed extract_mediaip() to rp_extract_mediaip()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: e58632eced11ac5f9a2a1693cd84ef9bc3508ebb URL: https://github.com/kamailio/kamailio/commit/e58632eced11ac5f9a2a1693cd84ef9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-12T10:32:38+02:00 rtpproxy: renamed extract_mediaip() to rp_extract_mediaip() - extract_mediaip() is also in core sdp parser (cherry picked from commit 8d0044770e94eaf7099eabbb55abe177e52e5373) (cherry picked from commit eec7d2613489613725b8979ce3d00d6616bb80c8) --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/e58632eced11ac5f9a2a1693cd84ef9… Patch: https://github.com/kamailio/kamailio/commit/e58632eced11ac5f9a2a1693cd84ef9… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 8aef20019f..23c8357e4b 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -114,7 +114,7 @@ static str DEFAULT_RTPP_SET_ID_STR = str_init("0"); #define PTL_CPROTOVER "20081102" #define CPORT "22222" -static int extract_mediaip(str *, str *, int *, char *); +static int rp_extract_mediaip(str *, str *, int *, char *); static int alter_mediaip(struct sip_msg *, str *, str *, int, str *, int, int); static int alter_mediaport(struct sip_msg *, str *, str *, str *, int); static int alter_rtcp(struct sip_msg *msg, str *body, str *oldport, str *newport); @@ -958,7 +958,7 @@ replace_sdp_ip(struct sip_msg* msg, str *org_body, char *line, str *ip) } body1 = body; for(;;) { - if (extract_mediaip(&body1, &oldip, &pf,line) == -1) + if (rp_extract_mediaip(&body1, &oldip, &pf,line) == -1) break; if (pf != AF_INET) { LM_ERR("not an IPv4 address in '%s' SDP\n",line); @@ -988,7 +988,7 @@ replace_sdp_ip(struct sip_msg* msg, str *org_body, char *line, str *ip) } static int -extract_mediaip(str *body, str *mediaip, int *pf, char *line) +rp_extract_mediaip(str *body, str *mediaip, int *pf, char *line) { char *cp, *cp1; int len, nextisip;

4 years, 2 months

git:5.3:97d3d11d: nathelper: renamed extract_mediaip() to nh_extract_mediaip()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 97d3d11dbdb736010e9e6f563a9cee58731e0e41 URL: https://github.com/kamailio/kamailio/commit/97d3d11dbdb736010e9e6f563a9cee5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-12T10:32:30+02:00 nathelper: renamed extract_mediaip() to nh_extract_mediaip() - extract_mediaip() is also in core sdp parser (cherry picked from commit b0f239a2c16b71b8b7e7b325ea121ffc48afa78e) (cherry picked from commit a989f384b5cb95e096e89899c57d8f11283b12cb) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/97d3d11dbdb736010e9e6f563a9cee5… Patch: https://github.com/kamailio/kamailio/commit/97d3d11dbdb736010e9e6f563a9cee5… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 2c5de3b2cf..3a4e79eaae 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -115,7 +115,7 @@ static int pv_get_rr_count_f(struct sip_msg *, pv_param_t *, pv_value_t *); static int pv_get_rr_top_count_f(struct sip_msg *, pv_param_t *, pv_value_t *); static int fix_nated_sdp_f(struct sip_msg *, char *, char *); static int is_rfc1918_f(struct sip_msg *, char *, char *); -static int extract_mediaip(str *, str *, int *, char *, int); +static int nh_extract_mediaip(str *, str *, int *, char *, int); static int alter_mediaip(struct sip_msg *, str *, str *, int, str *, int, int); static int fix_nated_register_f(struct sip_msg *, char *, char *); static int fixup_fix_nated_register(void **param, int param_no); @@ -1589,7 +1589,7 @@ static inline int replace_sdp_ip( } body1 = body; for(;;) { - if(extract_mediaip(&body1, &oldip, &pf, line, linelen) == -1) + if(nh_extract_mediaip(&body1, &oldip, &pf, line, linelen) == -1) break; if(pf != AF_INET) { LM_ERR("not an IPv4 address in '%s' SDP\n", line); @@ -1744,7 +1744,8 @@ static int fix_nated_sdp_f(struct sip_msg *msg, char *str1, char *str2) return ki_fix_nated_sdp_ip(msg, level, &ip); } -static int extract_mediaip(str *body, str *mediaip, int *pf, char *line, int linelen) +static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, + int linelen) { char *cp, *cp1; int len, nextisip;

4 years, 2 months

git:5.3:432bc89a: nathelper: docs - updated notes for fix_nated_sdp. few typos fixed [skip ci]

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 432bc89a963a1e71a107e6f73d103a6bbae02833 URL: https://github.com/kamailio/kamailio/commit/432bc89a963a1e71a107e6f73d103a6… Author: Arsen Semenov <arsperger(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-12T10:32:20+02:00 nathelper: docs - updated notes for fix_nated_sdp. few typos fixed [skip ci] (cherry picked from commit 64579fee33d0a82a583b75184f78fcb7c9df2d82) (cherry picked from commit d5393ffd76cc37e98365d7b945454e0215d9f82f) --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/432bc89a963a1e71a107e6f73d103a6… Patch: https://github.com/kamailio/kamailio/commit/432bc89a963a1e71a107e6f73d103a6… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 64defce296..ee94853beb 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -562,7 +562,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; <listitem> <para><emphasis>0x02</emphasis> - rewrite media &ip; address (c=) with source address of the message - or the provided IP address (the provide IP address take + or the provided IP address. (a=rtpc) param will be rewritten if exists. (the provided IP address take precedence over the source address).</para> </listitem> <listitem> @@ -572,7 +572,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; <listitem> <para><emphasis>0x08</emphasis> - rewrite IP from origin description (o=) with source address of the message - or the provided IP address (the provide IP address take + or the provided IP address. (a=rtpc) param will be rewritten if exists. (the provided IP address take precedence over the source address).</para> </listitem> </itemizedlist> @@ -582,7 +582,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; If not specified, the received signalling IP will be used. The parameter allows pseudo-variables usage. NOTE: For the IP to be used, you need to use 0x02 or 0x08 flags, otherwise it will have - no effect. + no effect. Must be IPv4 address family. </para> </listitem> </itemizedlist>

4 years, 2 months

git:5.3:4c17c00b: nathelper: fix_nated_sdp added support for a=rtcp param RFC3605

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 4c17c00ba53275308490cd7f6994c8f1785d3a53 URL: https://github.com/kamailio/kamailio/commit/4c17c00ba53275308490cd7f6994c8f… Author: Arsen Semenov <arsperger(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-12T10:32:09+02:00 nathelper: fix_nated_sdp added support for a=rtcp param RFC3605 - GH #2459 (cherry picked from commit 088738ce16e73339e4c1b78c11f6ad6f8f3394cf) (cherry picked from commit fd4dd36319599867e590098d86dc37186595cfad) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/4c17c00ba53275308490cd7f6994c8f… Patch: https://github.com/kamailio/kamailio/commit/4c17c00ba53275308490cd7f6994c8f… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 7d326508c8..2c5de3b2cf 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -115,7 +115,7 @@ static int pv_get_rr_count_f(struct sip_msg *, pv_param_t *, pv_value_t *); static int pv_get_rr_top_count_f(struct sip_msg *, pv_param_t *, pv_value_t *); static int fix_nated_sdp_f(struct sip_msg *, char *, char *); static int is_rfc1918_f(struct sip_msg *, char *, char *); -static int extract_mediaip(str *, str *, int *, char *); +static int extract_mediaip(str *, str *, int *, char *, int); static int alter_mediaip(struct sip_msg *, str *, str *, int, str *, int, int); static int fix_nated_register_f(struct sip_msg *, char *, char *); static int fixup_fix_nated_register(void **param, int param_no); @@ -1569,7 +1569,7 @@ static int is_rfc1918_f(struct sip_msg *msg, char *str1, char *str2) /* replace ip addresses in SDP and return umber of replacements */ static inline int replace_sdp_ip( - struct sip_msg *msg, str *org_body, char *line, str *ip) + struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen) { str body1, oldip, newip; str body = *org_body; @@ -1589,7 +1589,7 @@ static inline int replace_sdp_ip( } body1 = body; for(;;) { - if(extract_mediaip(&body1, &oldip, &pf, line) == -1) + if(extract_mediaip(&body1, &oldip, &pf, line, linelen) == -1) break; if(pf != AF_INET) { LM_ERR("not an IPv4 address in '%s' SDP\n", line); @@ -1692,20 +1692,31 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) } } - if(level & FIX_MEDIP) { - /* Iterate all c= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0); - if(ret == -1) - return -1; - count += ret; - } + if(level & (FIX_MEDIP | FIX_ORGIP)) { - if(level & FIX_ORGIP) { - /* Iterate all o= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0); + /* Iterate all a=rtcp and replace ips in them. rfc3605 */ + ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6); if(ret == -1) - return -1; - count += ret; + LM_DBG("a=rtcp parameter does not exist. nothing to do.\n"); + else + count += ret; + + if(level & FIX_MEDIP) { + /* Iterate all c= and replace ips in them. */ + ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2); + if(ret == -1) + return -1; + count += ret; + } + + if(level & FIX_ORGIP) { + /* Iterate all o= and replace ips in them. */ + ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2); + if(ret == -1) + return -1; + count += ret; + } + } return count > 0 ? 1 : 2; @@ -1733,22 +1744,22 @@ static int fix_nated_sdp_f(struct sip_msg *msg, char *str1, char *str2) return ki_fix_nated_sdp_ip(msg, level, &ip); } -static int extract_mediaip(str *body, str *mediaip, int *pf, char *line) +static int extract_mediaip(str *body, str *mediaip, int *pf, char *line, int linelen) { char *cp, *cp1; int len, nextisip; cp1 = NULL; for(cp = body->s; (len = body->s + body->len - cp) > 0;) { - cp1 = ser_memmem(cp, line, len, 2); + cp1 = ser_memmem(cp, line, len, linelen); if(cp1 == NULL || cp1[-1] == '\n' || cp1[-1] == '\r') break; - cp = cp1 + 2; + cp = cp1 + linelen; } if(cp1 == NULL) return -1; - mediaip->s = cp1 + 2; + mediaip->s = cp1 + linelen; mediaip->len = eat_line(mediaip->s, body->s + body->len - mediaip->s) - mediaip->s; trim_len(mediaip->len, mediaip->s, *mediaip);

4 years, 2 months

git:5.3:1eecbb23: phonenum: note about the role of country code name for phonenum_match_cn()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 1eecbb239cce980cebd9e3853cc4e06fb5dd2da9 URL: https://github.com/kamailio/kamailio/commit/1eecbb239cce980cebd9e3853cc4e06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-12T10:31:55+02:00 phonenum: note about the role of country code name for phonenum_match_cn() (cherry picked from commit dfd6c3966ed70d111a9196076bc29767c395d814) (cherry picked from commit 755867b920e4e0d17a4bdf447a0d59a06875f8e1) --- Modified: src/modules/phonenum/doc/phonenum_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1eecbb239cce980cebd9e3853cc4e06… Patch: https://github.com/kamailio/kamailio/commit/1eecbb239cce980cebd9e3853cc4e06… --- diff --git a/src/modules/phonenum/doc/phonenum_admin.xml b/src/modules/phonenum/doc/phonenum_admin.xml index d30c2026ee..f3a3e98ede 100644 --- a/src/modules/phonenum/doc/phonenum_admin.xml +++ b/src/modules/phonenum/doc/phonenum_admin.xml @@ -156,6 +156,14 @@ if(phonenum_match("1-484-555-8888", "src")) { (two letter, e.g: "DE", "US", "ES"). The function has to be called before accessing a key via: $phn(pvc=>key). </para> + <para> + Note from libphonenumber library docs: country name code is the region + that is expected the number to be from. It is only used if the number + being parsed is not written in international format. The country code + for the number in this case would be stored as that of the region + supplied. If the number is guaranteed to start with a '+' followed + by the country calling code, then region 'ZZ'. + </para> <para> The parameters can be static strings or strings with variables. </para>

4 years, 2 months

git:5.3:3c3e3f48: core: dns cache - removed disabled code between #if 0 ... #endif

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 3c3e3f48c28167b68a572d2136dd41d417fb504a URL: https://github.com/kamailio/kamailio/commit/3c3e3f48c28167b68a572d2136dd41d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-12T10:31:46+02:00 core: dns cache - removed disabled code between #if 0 ... #endif (cherry picked from commit 298aeb7f93bfa75ec78bc941f2c76167525b2e61) (cherry picked from commit 75cb64a768d187baf5730067503a708959284827) --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/3c3e3f48c28167b68a572d2136dd41d… Patch: https://github.com/kamailio/kamailio/commit/3c3e3f48c28167b68a572d2136dd41d… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 81fc6a9e45..da0773d2f1 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -2488,37 +2488,6 @@ struct hostent* dns_resolvehost(char* name) } - - -#if 0 -/* resolves a host name trying NAPTR, SRV, A & AAAA lookups, for details - * see dns_sip_resolve() - * FIXME: this version will return only the first ip - * returns: hostent struct & *port filled with the port from the SRV record; - * 0 on error - */ -struct hostent* dns_sip_resolvehost(str* name, unsigned short* port, - char* proto) -{ - struct dns_srv_handle h; - struct ip_addr ip; - int ret; - - if ((cfg_get(core, core_cfg, use_dns_cache==0)) || (dns_hash==0)){ - /* not init or off => use normal, non-cached version */ - return _sip_resolvehost(name, port, proto); - } - dns_srv_handle_init(&h); - ret=dns_sip_resolve(&h, name, &ip, port, proto, dns_flags); - dns_srv_handle_put(&h); - if (ret>=0) - return ip_addr2he(name, &ip); - return 0; -} -#endif - - - /* resolves a host name trying SRV lookup if *port==0 or normal A/AAAA lookup * if *port!=0. * when performing SRV lookup (*port==0) it will use proto to look for

4 years, 2 months

git:5.3:31ac72f9: tm: do not add duplicate headers in local requests

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 31ac72f9b43862f9005a0f691a52c8439fe1e8c5 URL: https://github.com/kamailio/kamailio/commit/31ac72f9b43862f9005a0f691a52c84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-12T10:30:17+02:00 tm: do not add duplicate headers in local requests (cherry picked from commit ada3701d22b1fd579f06b4f54fa695fa988e685f) (cherry picked from commit f57c900b438f3233fa1e9a9d3ca8cd383a30baa6) --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/31ac72f9b43862f9005a0f691a52c84… Patch: https://github.com/kamailio/kamailio/commit/31ac72f9b43862f9005a0f691a52c84… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index bd9952467b..d3883e54b2 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -268,6 +268,7 @@ char *build_local_reparse(tm_cell_t *Trans,unsigned int branch, struct hdr_field *reas1, *reas_last, *hdr; int hadded = 0; sr_cfgenv_t *cenv = NULL; + hdr_flags_t hdr_flags = 0; invite_buf = Trans->uac[branch].request.buffer; invite_len = Trans->uac[branch].request.buffer_len; @@ -361,6 +362,11 @@ char *build_local_reparse(tm_cell_t *Trans,unsigned int branch, switch(hf_type) { case HDR_CSEQ_T: /* find the method name and replace it */ + if(hdr_flags & HDR_CSEQ_F) { + LM_DBG("duplicate CSeq header\n"); + goto errorhdr; + } + hdr_flags |= HDR_CSEQ_F; while ((s < invite_buf_end) && ((*s == ':') || (*s == ' ') || (*s == '\t') || ((*s >= '0') && (*s <= '9'))) @@ -381,6 +387,12 @@ char *build_local_reparse(tm_cell_t *Trans,unsigned int branch, break; case HDR_TO_T: + if(hdr_flags & HDR_TO_F) { + LM_DBG("duplicate To header\n"); + goto errorhdr; + } + hdr_flags |= HDR_TO_F; + if (to_len == 0) { /* there is no To tag required, just copy paste * the header */ @@ -395,7 +407,25 @@ char *build_local_reparse(tm_cell_t *Trans,unsigned int branch, break; case HDR_FROM_T: + /* copy hf */ + if(hdr_flags & HDR_FROM_F) { + LM_DBG("duplicate From header\n"); + goto errorhdr; + } + hdr_flags |= HDR_FROM_F; + s = lw_next_line(s, invite_buf_end); + append_str(d, s1, s - s1); + break; case HDR_CALLID_T: + /* copy hf */ + if(hdr_flags & HDR_CALLID_F) { + LM_DBG("duplicate Call-Id header\n"); + goto errorhdr; + } + hdr_flags |= HDR_CALLID_F; + s = lw_next_line(s, invite_buf_end); + append_str(d, s1, s - s1); + break; case HDR_ROUTE_T: case HDR_MAXFORWARDS_T: /* copy hf */ @@ -495,6 +525,7 @@ char *build_local_reparse(tm_cell_t *Trans,unsigned int branch, /* HDR_EOH_T was not found in the buffer, the message is corrupt */ LM_ERR("HDR_EOH_T was not found\n"); +errorhdr: shm_free(cancel_buf); error: LM_ERR("cannot build %.*s request\n", method_len, method);

4 years, 2 months

← Newer
1
...
31
32
33
34
35
36
37
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020