sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
528 discussions

git:5.4:755867b9: phonenum: note about the role of country code name for phonenum_match_cn()
by Daniel-Constantin Mierla 12 Oct '20

12 Oct '20

Module: kamailio Branch: 5.4 Commit: 755867b920e4e0d17a4bdf447a0d59a06875f8e1 URL: https://github.com/kamailio/kamailio/commit/755867b920e4e0d17a4bdf447a0d59a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-12T10:11:45+02:00 phonenum: note about the role of country code name for phonenum_match_cn() (cherry picked from commit dfd6c3966ed70d111a9196076bc29767c395d814) --- Modified: src/modules/phonenum/doc/phonenum_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/755867b920e4e0d17a4bdf447a0d59a… Patch: https://github.com/kamailio/kamailio/commit/755867b920e4e0d17a4bdf447a0d59a… --- 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>

1 0

git:5.4:75cb64a7: core: dns cache - removed disabled code between #if 0 ... #endif
by Daniel-Constantin Mierla 12 Oct '20

12 Oct '20

Module: kamailio Branch: 5.4 Commit: 75cb64a768d187baf5730067503a708959284827 URL: https://github.com/kamailio/kamailio/commit/75cb64a768d187baf5730067503a708… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-12T10:09:50+02:00 core: dns cache - removed disabled code between #if 0 ... #endif (cherry picked from commit 298aeb7f93bfa75ec78bc941f2c76167525b2e61) --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/75cb64a768d187baf5730067503a708… Patch: https://github.com/kamailio/kamailio/commit/75cb64a768d187baf5730067503a708… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index c8567813e5..923c65049d 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

1 0

git:5.4:1d8f45e8: tmx: safety check of expected route blocks for using $T_*() variables
by Daniel-Constantin Mierla 12 Oct '20

12 Oct '20

Module: kamailio Branch: 5.4 Commit: 1d8f45e88a8bc79646a330f5531c6b767e547754 URL: https://github.com/kamailio/kamailio/commit/1d8f45e88a8bc79646a330f5531c6b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-12T10:08:24+02:00 tmx: safety check of expected route blocks for using $T_*() variables - related to GH #2479 (cherry picked from commit 2e7710e292a649c6c57e46d5994d3b2cf3815865) --- Modified: src/modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/1d8f45e88a8bc79646a330f5531c6b7… Patch: https://github.com/kamailio/kamailio/commit/1d8f45e88a8bc79646a330f5531c6b7… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 15938fcd9e..1aa1dc0cff 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -305,6 +305,11 @@ int pv_get_t_var_req(struct sip_msg *msg, pv_param_t *param, { pv_spec_t *pv=NULL; + if(!is_route_type(CORE_ONREPLY_ROUTE|TM_ONREPLY_ROUTE)) { + LM_DBG("used in unsupported route block - type %d\n", get_route_type()); + return pv_get_null(msg, param, res); + } + if(pv_t_update_req(msg)) return pv_get_null(msg, param, res); @@ -320,6 +325,11 @@ int pv_get_t_var_rpl(struct sip_msg *msg, pv_param_t *param, { pv_spec_t *pv=NULL; + if(!is_route_type(FAILURE_ROUTE|BRANCH_FAILURE_ROUTE)) { + LM_DBG("used in unsupported route block - type %d\n", get_route_type()); + return pv_get_null(msg, param, res); + } + if(pv_t_update_rpl(msg)) return pv_get_null(msg, param, res); @@ -335,6 +345,11 @@ int pv_get_t_var_branch(struct sip_msg *msg, pv_param_t *param, { pv_spec_t *pv=NULL; + if(!is_route_type(FAILURE_ROUTE|BRANCH_FAILURE_ROUTE|TM_ONREPLY_ROUTE)) { + LM_DBG("used in unsupported route block - type %d\n", get_route_type()); + return pv_get_null(msg, param, res); + } + if(pv_t_update_rpl(msg)) return pv_get_null(msg, param, res); @@ -350,6 +365,11 @@ int pv_get_t_var_inv(struct sip_msg *msg, pv_param_t *param, { pv_spec_t *pv=NULL; + if(!is_route_type(REQUEST_ROUTE)) { + LM_DBG("used in unsupported route block - type %d\n", get_route_type()); + return pv_get_null(msg, param, res); + } + if(pv_t_update_inv(msg)) return pv_get_null(msg, param, res);

1 0

git:5.4:4c234562: lib/srdb1: db_use_table() more suggestive error messages
by Daniel-Constantin Mierla 12 Oct '20

12 Oct '20

Module: kamailio Branch: 5.4 Commit: 4c234562bf0265f2a221231e7f3d72648166995f URL: https://github.com/kamailio/kamailio/commit/4c234562bf0265f2a221231e7f3d726… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-12T10:07:47+02:00 lib/srdb1: db_use_table() more suggestive error messages (cherry picked from commit 57d33a2d76219ae3d1eb503044dadaeddc7e06fd) --- Modified: src/lib/srdb1/db.c --- Diff: https://github.com/kamailio/kamailio/commit/4c234562bf0265f2a221231e7f3d726… Patch: https://github.com/kamailio/kamailio/commit/4c234562bf0265f2a221231e7f3d726… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index d33c9390c8..54b66d330b 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -477,8 +477,12 @@ int db_check_table_version(db_func_t* dbf, db1_con_t* dbh, const str* table, */ int db_use_table(db1_con_t* _h, const str* _t) { - if (!_h || !_t || !_t->s) { - LM_ERR("invalid parameter value\n"); + if (!_h) { + LM_ERR("invalid connection parameter\n"); + return -1; + } + if (!_t || !_t->s) { + LM_ERR("invalid table parameter value\n"); return -1; }

1 0

git:5.4:26fb90fd: topos: docs - more details about what SIP traffic is handled
by Daniel-Constantin Mierla 12 Oct '20

12 Oct '20

Module: kamailio Branch: 5.4 Commit: 26fb90fd6ffdb239fa6c2779f281fae78f90c5ef URL: https://github.com/kamailio/kamailio/commit/26fb90fd6ffdb239fa6c2779f281fae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-12T10:07:23+02:00 topos: docs - more details about what SIP traffic is handled (cherry picked from commit 878971f2c0bc32233b6f18728f9b88537b3d19e8) --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/26fb90fd6ffdb239fa6c2779f281fae… Patch: https://github.com/kamailio/kamailio/commit/26fb90fd6ffdb239fa6c2779f281fae… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 8b3e2a0515..fa4f97b4d6 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -16,20 +16,23 @@ <section> <title>Overview</title> <para> - This module offers topology hiding by stripping the SIP routing - headers that show topology details. + This module offers topology hiding for INVITE-based dialogs, by stripping + the SIP routing headers that show topology details . The script interpreter gets the SIP messages with full content, so all existing functionality is preserved. </para> <para> The module is transparent for the configuration writer. It only needs to be - loaded (tune the parameters if needed). + loaded (tune the module parameters if needed). </para> <para> It also works for SIP MESSAGE or other requests that do not create - a call dialog -- record_route() must be used for them as well, the + a dialog -- record_route() must be used for them as well, the headers are not going to be in the messages sent to the network, they are needed to know local addresses used to communicate with each side. + At this moment it is not designed to work for presence (SUBSCRIBE-based) + dialogs. The REGISTER and PUBLISH requests are skipped from processing + by this module, expected to be terminated on a local SIP server. </para> </section> <section>

1 0

git:5.4:23bdd1f6: msrp: proper parsing ipv6 host part in uri
by Daniel-Constantin Mierla 12 Oct '20

12 Oct '20

Module: kamailio Branch: 5.4 Commit: 23bdd1f6f2581d745f20c66ca9a93e4dad55ffec URL: https://github.com/kamailio/kamailio/commit/23bdd1f6f2581d745f20c66ca9a93e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-12T10:03:38+02:00 msrp: proper parsing ipv6 host part in uri - enclose ipv6 address in square brackets for msrp pv - related to #2472 (cherry picked from commit 1cda029885dd89e2ec46fe28a0d6f656aad19e7a) --- Modified: src/modules/msrp/msrp_parser.c Modified: src/modules/msrp/msrp_vars.c --- Diff: https://github.com/kamailio/kamailio/commit/23bdd1f6f2581d745f20c66ca9a93e4… Patch: https://github.com/kamailio/kamailio/commit/23bdd1f6f2581d745f20c66ca9a93e4… --- diff --git a/src/modules/msrp/msrp_parser.c b/src/modules/msrp/msrp_parser.c index a6310cea93..4e5e67e130 100644 --- a/src/modules/msrp/msrp_parser.c +++ b/src/modules/msrp/msrp_parser.c @@ -491,10 +491,25 @@ int msrp_parse_uri(char *start, int len, msrp_uri_t *uri) } hook = &uri->host; hook->s = s; + if(*s == '[') + { + /* IPv6 */ + p = q_memchr(s, ']', e - s); + if(p == NULL) + { + goto error; + } + s = p + 1; + hook->len = s - hook->s; + } p = q_memchr(s, ':', e - s); if(p!=NULL) { - hook->len = p - hook->s; + if(hook->len == 0) + { + /* host len was not set yet */ + hook->len = p - hook->s; + } hook = &uri->port; s = p+1; if(s>=e) goto error; diff --git a/src/modules/msrp/msrp_vars.c b/src/modules/msrp/msrp_vars.c index fddabde189..8384ff0910 100644 --- a/src/modules/msrp/msrp_vars.c +++ b/src/modules/msrp/msrp_vars.c @@ -283,7 +283,7 @@ int pv_get_msrp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) memcpy(p, "msrp://", 7); p+=7; } - strcpy(p, ip_addr2a(&mf->tcpinfo->rcv->src_ip)); + strcpy(p, ip_addr2strz(&mf->tcpinfo->rcv->src_ip)); strcat(p, ":"); strcat(p, int2str(mf->tcpinfo->rcv->src_port, NULL)); s.len = strlen(s.s);

1 0

git:master:9f556322: core: parser - use flags for macros to detect if it is sip or http
by Daniel-Constantin Mierla 12 Oct '20

12 Oct '20

Module: kamailio Branch: master Commit: 9f556322d8802239d40b2b39a6a150ff77014453 URL: https://github.com/kamailio/kamailio/commit/9f556322d8802239d40b2b39a6a150f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-12T09:19:19+02:00 core: parser - use flags for macros to detect if it is sip or http --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/9f556322d8802239d40b2b39a6a150f… Patch: https://github.com/kamailio/kamailio/commit/9f556322d8802239d40b2b39a6a150f… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index d2ff887372..1abc042e28 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -141,28 +141,26 @@ if ( (*tmp==(firstchar) || *tmp==((firstchar) | 32)) && \ tmp=buffer+methodname##_LEN; \ } -#define IS_HTTP(req) \ - ((req)->first_line.u.request.version.len >= HTTP_VERSION_LEN && \ - !strncasecmp((req)->first_line.u.request.version.s, \ - HTTP_VERSION, HTTP_VERSION_LEN)) - -#define IS_SIP(req) \ - ((req)->first_line.u.request.version.len >= SIP_VERSION_LEN && \ - !strncasecmp((req)->first_line.u.request.version.s, \ - SIP_VERSION, SIP_VERSION_LEN)) - -#define IS_HTTP_REPLY(rpl) \ - (((rpl)->first_line.u.reply.version.len >= HTTP_VERSION_LEN && \ - !strncasecmp((rpl)->first_line.u.reply.version.s, \ - HTTP_VERSION, HTTP_VERSION_LEN)) || \ - ((rpl)->first_line.u.reply.version.len >= HTTP2_VERSION_LEN && \ - !strncasecmp((rpl)->first_line.u.reply.version.s, \ - HTTP2_VERSION, HTTP2_VERSION_LEN))) - -#define IS_SIP_REPLY(rpl) \ - ((rpl)->first_line.u.reply.version.len >= SIP_VERSION_LEN && \ - !strncasecmp((rpl)->first_line.u.reply.version.s, \ - SIP_VERSION, SIP_VERSION_LEN)) + +/* sip request */ +#define IS_SIP(req) \ + (((req)->first_line.type == SIP_REQUEST) && \ + ((req)->first_line.type & FLINE_FLAG_PROTO_SIP)) + +/* sip reply */ +#define IS_SIP_REPLY(rpl) \ + (((rpl)->first_line.type == SIP_REPLY) && \ + ((rpl)->first_line.type & FLINE_FLAG_PROTO_SIP)) + +/* http request */ +#define IS_HTTP(req) \ + (((req)->first_line.type == SIP_REQUEST) && \ + ((req)->first_line.type & FLINE_FLAG_PROTO_HTTP)) + +/* http reply */ +#define IS_HTTP_REPLY(rpl) \ + (((rpl)->first_line.type == SIP_REPLY) && \ + ((rpl)->first_line.type & FLINE_FLAG_PROTO_HTTP)) /*! \brief * Return a URI to which the message should be really sent (not what should

1 0

git:master:434dd740: core: parse iidentityinfo - use ZSW() define from core
by Daniel-Constantin Mierla 12 Oct '20

12 Oct '20

Module: kamailio Branch: master Commit: 434dd7400b88664ac3930a38d69568a06d9edf67 URL: https://github.com/kamailio/kamailio/commit/434dd7400b88664ac3930a38d69568a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-12T08:31:28+02:00 core: parse iidentityinfo - use ZSW() define from core --- Modified: src/core/parser/parse_identityinfo.c Modified: src/core/parser/parse_identityinfo.h --- Diff: https://github.com/kamailio/kamailio/commit/434dd7400b88664ac3930a38d69568a… Patch: https://github.com/kamailio/kamailio/commit/434dd7400b88664ac3930a38d69568a… --- diff --git a/src/core/parser/parse_identityinfo.c b/src/core/parser/parse_identityinfo.c index 5111ad70b4..da613e798f 100644 --- a/src/core/parser/parse_identityinfo.c +++ b/src/core/parser/parse_identityinfo.c @@ -27,6 +27,7 @@ #include <stdlib.h> #include <string.h> #include <ctype.h> +#include "../ut.h" #include "../mem/mem.h" #include "parse_def.h" #include "parse_identityinfo.h" diff --git a/src/core/parser/parse_identityinfo.h b/src/core/parser/parse_identityinfo.h index e4f3190b00..10cbe59e40 100644 --- a/src/core/parser/parse_identityinfo.h +++ b/src/core/parser/parse_identityinfo.h @@ -59,8 +59,6 @@ enum { II_M_TOKEN }; -#define ZSW(_c) ((_c)?(_c):"") - struct identityinfo_body { int error; /* Error code */ str uri; /* URI */

1 0

git:master:0ed7b57b: core: parser - use sip_parser_log for parsing log messages
by Daniel-Constantin Mierla 12 Oct '20

12 Oct '20

Module: kamailio Branch: master Commit: 0ed7b57b31f108f904609c2991a24396b3e94a87 URL: https://github.com/kamailio/kamailio/commit/0ed7b57b31f108f904609c2991a2439… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-11T14:17:30+02:00 core: parser - use sip_parser_log for parsing log messages --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/0ed7b57b31f108f904609c2991a2439… Patch: https://github.com/kamailio/kamailio/commit/0ed7b57b31f108f904609c2991a2439… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 1e24b21e49..682b71cd7c 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -359,8 +359,9 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int if (msg->callid==0) { msg->callid=hf; } else if(ksr_sip_parser_mode & KSR_SIP_PARSER_MODE_STRICT) { - ERR("duplicate Call-ID header field [%.*s]\n", - (end-tmp>100)?100:(int)(end-tmp), tmp); + LOG(cfg_get(core, core_cfg, sip_parser_log), + "duplicate Call-ID header field [%.*s]\n", + (end-tmp>100)?100:(int)(end-tmp), tmp); goto error; } msg->parsed_flag|=HDR_CALLID_F; @@ -373,8 +374,9 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int if (msg->to==0) { msg->to=hf; } else if(ksr_sip_parser_mode & KSR_SIP_PARSER_MODE_STRICT) { - ERR("duplicate To header field [%.*s]\n", - (end-tmp>100)?100:(int)(end-tmp), tmp); + LOG(cfg_get(core, core_cfg, sip_parser_log), + "duplicate To header field [%.*s]\n", + (end-tmp>100)?100:(int)(end-tmp), tmp); goto error; } msg->parsed_flag|=HDR_TO_F; @@ -407,8 +409,9 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int if(msg->maxforwards==0) { msg->maxforwards=hf; } else { - ERR("duplicate Max-Forwards header field [%.*s]\n", - (end-tmp>100)?100:(int)(end-tmp), tmp); + LOG(cfg_get(core, core_cfg, sip_parser_log), + "duplicate Max-Forwards header field [%.*s]\n", + (end-tmp>100)?100:(int)(end-tmp), tmp); goto error; } msg->parsed_flag|=HDR_MAXFORWARDS_F; @@ -429,8 +432,9 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int if (msg->content_length==0) { msg->content_length = hf; } else if(ksr_sip_parser_mode & KSR_SIP_PARSER_MODE_STRICT) { - ERR("duplicate Content-Length header field [%.*s]\n", - (end-tmp>100)?100:(int)(end-tmp), tmp); + LOG(cfg_get(core, core_cfg, sip_parser_log), + "duplicate Content-Length header field [%.*s]\n", + (end-tmp>100)?100:(int)(end-tmp), tmp); goto error; } msg->parsed_flag|=HDR_CONTENTLENGTH_F;

1 0

git:master:bb1a7d9a: core: parse first line - detect http/2 also for requests
by Daniel-Constantin Mierla 12 Oct '20

12 Oct '20

Module: kamailio Branch: master Commit: bb1a7d9a70501ddb89073564ec49d343a75faa27 URL: https://github.com/kamailio/kamailio/commit/bb1a7d9a70501ddb89073564ec49d34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-11T12:48:28+02:00 core: parse first line - detect http/2 also for requests - it was done for replies - set additional flag to differentiate on http/2 version --- Modified: src/core/parser/parse_fline.c Modified: src/core/parser/parse_fline.h --- Diff: https://github.com/kamailio/kamailio/commit/bb1a7d9a70501ddb89073564ec49d34… Patch: https://github.com/kamailio/kamailio/commit/bb1a7d9a70501ddb89073564ec49d34… --- diff --git a/src/core/parser/parse_fline.c b/src/core/parser/parse_fline.c index dac891fad7..43afd723d8 100644 --- a/src/core/parser/parse_fline.c +++ b/src/core/parser/parse_fline.c @@ -35,10 +35,6 @@ #include "../mem/mem.h" #include "../ut.h" -/* flags for first line - * - stored on a short field (16 flags) */ -#define FLINE_FLAG_PROTO_SIP (1<<0) -#define FLINE_FLAG_PROTO_HTTP (1<<1) int http_reply_parse = 0; @@ -110,7 +106,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start* fl) } else if (strncasecmp( tmp+1, &HTTP2_VERSION[1], HTTP2_VERSION_LEN-1)==0 && (*(tmp+HTTP2_VERSION_LEN)==' ')) { fl->type=SIP_REPLY; - fl->flags|=FLINE_FLAG_PROTO_HTTP; + fl->flags|=(FLINE_FLAG_PROTO_HTTP | FLINE_FLAG_PROTO_HTTP2); fl->u.reply.version.len=HTTP2_VERSION_LEN; tmp=buffer+HTTP2_VERSION_LEN; } @@ -235,15 +231,24 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start* fl) && !strncasecmp(fl->u.request.version.s+1, &SIP_VERSION[1], SIP_VERSION_LEN-1)) { fl->flags|=FLINE_FLAG_PROTO_SIP; - } else if(fl->u.request.version.len >= HTTP_VERSION_LEN + } else if(fl->u.request.version.len >= 4 && (fl->u.request.version.s[0]=='H' - || fl->u.request.version.s[0]=='h') - && !strncasecmp(fl->u.request.version.s+1, - &HTTP_VERSION[1], HTTP_VERSION_LEN-1)) { - fl->flags|=FLINE_FLAG_PROTO_HTTP; + || fl->u.request.version.s[0]=='h')) { + if(fl->u.request.version.len >= HTTP_VERSION_LEN + && !strncasecmp(fl->u.request.version.s+1, + &HTTP_VERSION[1], HTTP_VERSION_LEN-1)) { + fl->flags|=FLINE_FLAG_PROTO_HTTP; + } else if(fl->u.request.version.len >= HTTP2_VERSION_LEN + && !strncasecmp(fl->u.request.version.s+1, + &HTTP2_VERSION[1], HTTP2_VERSION_LEN-1)) { + fl->flags|=(FLINE_FLAG_PROTO_HTTP | FLINE_FLAG_PROTO_HTTP2); + } } } + LM_DBG("first line type %d (%s) flags %d\n", (int)fl->type, + (fl->type==SIP_REPLY)?"reply(status)":"request", (int)fl->flags); + return nl; error: diff --git a/src/core/parser/parse_fline.h b/src/core/parser/parse_fline.h index 63f74ececf..d65b04bdbb 100644 --- a/src/core/parser/parse_fline.h +++ b/src/core/parser/parse_fline.h @@ -34,14 +34,24 @@ #include "../str.h" + +/* Invalid message */ +#define SIP_INVALID 0 +#define MSG_INVALID 0 + /* Message is request */ #define SIP_REQUEST 1 +#define MSG_REQUEST 1 /* Message is reply */ #define SIP_REPLY 2 +#define MSG_REPLY 2 -/* Invalid message */ -#define SIP_INVALID 0 +/* flags for first line + * - stored on a short field (16 flags) */ +#define FLINE_FLAG_PROTO_SIP (1<<0) /* sip 2.0 protocol */ +#define FLINE_FLAG_PROTO_HTTP (1<<1) /* any http protocol */ +#define FLINE_FLAG_PROTO_HTTP2 (1<<2) /* additional for http 2 */ #define SIP_VERSION "SIP/2.0" #define SIP_VERSION_LEN 7 @@ -85,7 +95,7 @@ typedef struct msg_start { str method; /*!< Method string */ str uri; /*!< Request URI */ str version; /*!< SIP version */ - int method_value; + int method_value; /*!< Method id value */ } request; struct { str version; /*!< SIP version */

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
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