sr-dev September 2013

sr-dev@lists.kamailio.org

33 participants
297 discussions

[tracker] Task closed: avpops: avp_check() use xavp semantic on first parameter
by sip-router 23 Sep '13

23 Sep '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#347 - avpops: avp_check() use xavp semantic on first parameter User who did this - Víctor Seva (linuxmaniac) Reason for closing: Implemented More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=347 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: avpops: refresh README
by Victor Seva 23 Sep '13

23 Sep '13

Module: sip-router Branch: master Commit: b6b5b7bf5d08ad20cc00cf89ef3d2f03e913c882 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6b5b7b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Mon Sep 23 21:30:32 2013 +0200 avpops: refresh README --- modules/avpops/README | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/modules/avpops/README b/modules/avpops/README index df0bfe7..95d529b 100644 --- a/modules/avpops/README +++ b/modules/avpops/README @@ -544,11 +544,24 @@ avp_pushto("$br","$avp(i:680)"); ... avp_check("$avp(i:678)", "lt/i:345/g"); avp_check("$fd","eq/$td/I"); -avp_check("$avp(s:foo)","gt/$avp($bar)/g"); +avp_check("$avp(s:foo)","gt/$avp($var(bar))/g"); avp_check("$avp(s:foo)","re/sip:.*@bar.net/g"); avp_check("$avp(s:foo)","fm/$avp(fm_avp)/g"); ... + NOTE: you can use a xavp variable ($xavp(key1[indx1]=>key2[indx2])) as + first or second parameter. If you want to check all the values of the + key2 you should use [*] at indx2. The [*] index is not allowed at + indx1. +... +avp_check("$xavp(op[0]=>lt[0])", "lt/i:345/g"); +avp_check("$xavp(op=>fd","eq/$td/I"); +avp_check("$xavp(op[1]=>foo[*])","gt/$avp($var(bar))/g"); +avp_check("$avp(s:foo)","re/$xavp(op[0]=>re[*]/g"); +$var(id)=2; +avp_check("$xavp(op=>foo[*])","fm/$xavp(op=>fm[$var(id)])/g"); +... + 5.8. avp_copy(old_name,new_name) Copy / move an avp under a new name.

1 0

git:master: avops: avp_check() xavp as first parameter
by Victor Seva 23 Sep '13

23 Sep '13

Module: sip-router Branch: master Commit: dd049bad86eca2371b8f6ae1fd73656ff56e4e15 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd049ba… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Sat Sep 21 10:49:57 2013 +0200 avops: avp_check() xavp as first parameter --- modules/avpops/avpops_impl.c | 74 ++++++++++++++++++++++++++++++------------ 1 files changed, 53 insertions(+), 21 deletions(-) diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index 4fa2a53..ee2e052 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -1114,7 +1114,7 @@ int get_xavp(struct sip_msg *msg, pv_xavp_name_t *xname, return 1; } -int check_xavp_param(struct sip_msg* msg, pv_spec_p spec, sr_xavp_t **xavp, +int get_xavp_param(struct sip_msg* msg, pv_spec_p spec, sr_xavp_t **xavp, int *flag) { int res; @@ -1132,6 +1132,20 @@ error: return -1; } +int set_val_xavp(sr_xavp_t *xavp, int_str *avp_val, int *flag) +{ + if(xavp->val.type!=SR_XTYPE_INT&&xavp->val.type!=SR_XTYPE_STR) + return -1; + if(xavp->val.type==SR_XTYPE_INT) + { + avp_val->n = xavp->val.v.i; + } else { + *flag = AVP_VAL_STR; + avp_val->s = xavp->val.v.s; + } + return 1; +} + int ops_check_avp( struct sip_msg* msg, struct fis_param* src, struct fis_param* val) { @@ -1152,8 +1166,10 @@ int ops_check_avp( struct sip_msg* msg, struct fis_param* src, char backup; regex_t re_temp; regex_t *re; - sr_xavp_t *xavp2 = NULL; - int xavp_flags=0; + sr_xavp_t *xavp1 = NULL; // first parameter + sr_xavp_t *xavp2 = NULL; // second parameter + int xavp1_flags=0; + int xavp2_flags=0; /* look if the required avp(s) is/are present */ if(src->u.sval->type==PVT_AVP) @@ -1171,6 +1187,19 @@ int ops_check_avp( struct sip_msg* msg, struct fis_param* src, goto error; } flags = avp1->flags; + } else if(src->u.sval->type==PVT_XAVP) + { + avp1 = 0; + flags = 0; + LM_DBG("xavp1 found!"); + /* search for the xavp */ + if(get_xavp_param(msg, src->u.sval, &xavp1, &xavp1_flags)<0) + goto error; + if(set_val_xavp(xavp1, &avp_val, &flags)<0) + { + LM_ERR("src value is not INT or STR\n"); + goto next; + } } else { avp1 = 0; flags = 0; @@ -1226,24 +1255,12 @@ cycle1: { avp2 = 0; if(xavp2==NULL) - { - if(check_xavp_param(msg, val->u.sval, &xavp2, &xavp_flags)<0) - { + if(get_xavp_param(msg, val->u.sval, &xavp2, &xavp2_flags)<0) goto error; - } - } - if(xavp2->val.type!=SR_XTYPE_INT&&xavp2->val.type!=SR_XTYPE_STR) - { - LM_ERR("cannot dst value is not INT or STR\n"); - goto error; - } - check_flags = 0; - if(xavp2->val.type==SR_XTYPE_INT) + if(set_val_xavp(xavp2, &check_val, &check_flags)<0) { - check_val.n = xavp2->val.v.i; - } else { - check_flags = AVP_VAL_STR; - check_val.s = xavp2->val.v.s; + LM_ERR("dst value is not INT or STR\n"); + goto next; } } else { avp2 = 0; @@ -1415,10 +1432,10 @@ next: { check_flags = avp2->flags; goto cycle2; - } else if ((xavp2!=NULL) && (xavp_flags&PV_IDX_ALL) + } else if ((xavp2!=NULL) && (xavp2_flags&PV_IDX_ALL) && (xavp2=xavp_get_next(xavp2))!=NULL) { - LM_DBG("xavp->next\n"); + LM_DBG("xavp2->next\n"); goto cycle1; /* cycle for the first value -> next avp */ } else { @@ -1428,6 +1445,21 @@ next: if (avp1) goto cycle1; } + else if((xavp1!=NULL) && (xavp1_flags&PV_IDX_ALL)) + { + xavp1=xavp_get_next(xavp1); + if (xavp1!=NULL) + { + LM_DBG("xavp1->next\n"); + xavp2 = NULL; + if(set_val_xavp(xavp1, &avp_val, &flags)<0) + { + LM_ERR("src value is not INT or STR\n"); + goto next; + } + goto cycle1; + } + } } LM_DBG("no match\n");

1 0

git:master: avpops: update avp_check documentation related to xavp vars as parameters
by Victor Seva 23 Sep '13

23 Sep '13

Module: sip-router Branch: master Commit: 3abb169001022567aa0be629677b9e445d1c3ca5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3abb169… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Sat Sep 21 11:26:45 2013 +0200 avpops: update avp_check documentation related to xavp vars as parameters --- modules/avpops/doc/avpops_admin.xml | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/modules/avpops/doc/avpops_admin.xml b/modules/avpops/doc/avpops_admin.xml index dc3ab0c..84434b7 100644 --- a/modules/avpops/doc/avpops_admin.xml +++ b/modules/avpops/doc/avpops_admin.xml @@ -760,11 +760,26 @@ avp_pushto("$br","$avp(i:680)"); ... avp_check("$avp(i:678)", "lt/i:345/g"); avp_check("$fd","eq/$td/I"); -avp_check("$avp(s:foo)","gt/$avp($bar)/g"); +avp_check("$avp(s:foo)","gt/$avp($var(bar))/g"); avp_check("$avp(s:foo)","re/sip:.*@bar.net/g"); avp_check("$avp(s:foo)","fm/$avp(fm_avp)/g"); ... </programlisting> + <para>NOTE: you can use a xavp variable ($xavp(key1[indx1]=>key2[indx2])) + as first or second parameter. + If you want to check all the values of the key2 you should + use [*] at indx2. The [*] index is not allowed at indx1. + </para> + <programlisting format="linespecific"> +... +avp_check("$xavp(op[0]=>lt[0])", "lt/i:345/g"); +avp_check("$xavp(op=>fd","eq/$td/I"); +avp_check("$xavp(op[1]=>foo[*])","gt/$avp($var(bar))/g"); +avp_check("$avp(s:foo)","re/$xavp(op[0]=>re[*]/g"); +$var(id)=2; +avp_check("$xavp(op=>foo[*])","fm/$xavp(op=>fm[$var(id)])/g"); +... + </programlisting> </example> </section> <section>

1 0

git:master: gzcompress: removed empty section in functions chapter
by Daniel-Constantin Mierla 23 Sep '13

23 Sep '13

Module: sip-router Branch: master Commit: 8a6a4f5d38ac693e7a79e0e761521375f3f5405b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a6a4f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 23 20:06:20 2013 +0200 gzcompress: removed empty section in functions chapter - use deflate overall config example --- modules/gzcompress/README | 10 +--------- modules/gzcompress/doc/gzcompress_admin.xml | 4 +--- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/modules/gzcompress/README b/modules/gzcompress/README index f594c0c..bfd9412 100644 --- a/modules/gzcompress/README +++ b/modules/gzcompress/README @@ -30,9 +30,6 @@ Daniel-Constantin Mierla 3.3. sanity_checks (integer) 4. Functions - - 4.1. - 5. Config File List of Examples @@ -59,9 +56,6 @@ Chapter 1. Admin Guide 3.3. sanity_checks (integer) 4. Functions - - 4.1. - 5. Config File 1. Overview @@ -163,8 +157,6 @@ modparam("gzcompress", "sanity_checks", 1) 4. Functions - 4.1. - None. 5. Config File @@ -211,7 +203,7 @@ request_route { remove_hf("Content-Encoding"); $du = "sip:127.0.0.1:9"; } else { - append_hf("Content-Encoding: gzip\r\n"); + append_hf("Content-Encoding: deflate\r\n"); $du = "sip:127.0.0.1:5060"; } forward(); diff --git a/modules/gzcompress/doc/gzcompress_admin.xml b/modules/gzcompress/doc/gzcompress_admin.xml index 5917e7b..ab46622 100644 --- a/modules/gzcompress/doc/gzcompress_admin.xml +++ b/modules/gzcompress/doc/gzcompress_admin.xml @@ -156,12 +156,10 @@ modparam("gzcompress", "sanity_checks", 1) </section> <section> <title>Functions</title> - <section> <para> None. </para> </section> - </section> <section> <title>Config File</title> <para> @@ -209,7 +207,7 @@ request_route { remove_hf("Content-Encoding"); $du = "sip:127.0.0.1:9"; } else { - append_hf("Content-Encoding: gzip\r\n"); + append_hf("Content-Encoding: deflate\r\n"); $du = "sip:127.0.0.1:5060"; } forward();

1 0

new module: gzcompress
by Daniel-Constantin Mierla 23 Sep '13

23 Sep '13

Hello, following the Kristian's email and blog about Apple Facetime using compressions of the body (http://lists.sip-router.org/pipermail/sr-users/2013-September/079816.html), I did a quick coding Friday evening and put together a new module that uses zlib to compress/decompress the body for SIP messages - I named it gzcompress, its readme is available at: - http://kamailio.org/docs/modules/devel/modules/gzcompress.html Might be useful for those that want to save bandwidth when peering two kamailios or target to get under MTU size. It is now enabled for SIP traffic only, but the plan is to get it for http as well, where it can be more relevant for xcap traffic. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Trainings - Berlin, Oct 21-24; Miami, Nov 11-13, 2013 - more details about Kamailio trainings at http://www.asipto.com -

4 5

git:master: gzcompress: readme updated to reflect default encoding value to deflate
by Daniel-Constantin Mierla 23 Sep '13

23 Sep '13

Module: sip-router Branch: master Commit: 3c65fd74f2473e857996ae1abf2d8fb8dcfaaaab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3c65fd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 23 18:50:14 2013 +0200 gzcompress: readme updated to reflect default encoding value to deflate --- modules/gzcompress/README | 6 +++--- modules/gzcompress/doc/gzcompress_admin.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/gzcompress/README b/modules/gzcompress/README index c1cc720..c3c8e6e 100644 --- a/modules/gzcompress/README +++ b/modules/gzcompress/README @@ -93,7 +93,7 @@ Chapter 1. Admin Guide An use case can be when having peering traffic between two Kamailio servers. Before relaying to the other Kamailio, use in config file: - append_hf("Content-Encoding: gzip\r\n"). + append_hf("Content-Encoding: deflate\r\n"). 2. Dependencies @@ -134,11 +134,11 @@ modparam("gzcompress", "header_name", "Encoded") Name of the header that indicates compression or decompression has to be done. - Default value is "gzip". + Default value is "deflate". Example 1.2. Set header_value parameter ... -modparam("gzcompress", "header_value", "tgz") +modparam("gzcompress", "header_value", "gzip") ... 3.3. sanity_checks (integer) diff --git a/modules/gzcompress/doc/gzcompress_admin.xml b/modules/gzcompress/doc/gzcompress_admin.xml index 61d3633..f7a91b0 100644 --- a/modules/gzcompress/doc/gzcompress_admin.xml +++ b/modules/gzcompress/doc/gzcompress_admin.xml @@ -54,7 +54,7 @@ <para> An use case can be when having peering traffic between two Kamailio servers. Before relaying to the other Kamailio, use - in config file: append_hf("Content-Encoding: gzip\r\n"). + in config file: append_hf("Content-Encoding: deflate\r\n"). </para> </section> <section> @@ -117,14 +117,14 @@ modparam("gzcompress", "header_name", "Encoded") </para> <para> <emphasis> - Default value is "gzip". + Default value is "deflate". </emphasis> </para> <example> <title>Set <varname>header_value</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("gzcompress", "header_value", "tgz") +modparam("gzcompress", "header_value", "gzip") ... </programlisting> </example>

1 0

git:master: gzcompress: added a small usage example in docs
by Daniel-Constantin Mierla 23 Sep '13

23 Sep '13

Module: sip-router Branch: master Commit: 65783f24859f5da45678f2c8a005ca867cc02b86 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65783f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 23 19:01:10 2013 +0200 gzcompress: added a small usage example in docs --- modules/gzcompress/README | 68 ++++++++++++++++++++++++++- modules/gzcompress/doc/gzcompress_admin.xml | 68 ++++++++++++++++++++++++++- 2 files changed, 134 insertions(+), 2 deletions(-) diff --git a/modules/gzcompress/README b/modules/gzcompress/README index c3c8e6e..f594c0c 100644 --- a/modules/gzcompress/README +++ b/modules/gzcompress/README @@ -33,11 +33,14 @@ Daniel-Constantin Mierla 4.1. + 5. Config File + List of Examples 1.1. Set header_name parameter 1.2. Set header_value parameter 1.3. Set sanity_checks parameter + 1.4. Enable body compression Chapter 1. Admin Guide @@ -59,11 +62,14 @@ Chapter 1. Admin Guide 4.1. + 5. Config File + 1. Overview This module is able to detect compressed body in received SIP message and decompress it as well as compress the body for outgoing SIP - message. + message. It works also for received HTTP request and replied HTTP + response (Kamailio cannot work in HTTP proxy mode). The decision of whether to do compression or decompression is made by detecting a special SIP header (default 'Content-Encoding') that @@ -160,3 +166,63 @@ modparam("gzcompress", "sanity_checks", 1) 4.1. None. + +5. Config File + + Next example shows how to enable compression for forwarded requests, as + well as replying with compressed body for HTTP requests. For SIP, the + request is recevied and forwarded to itself once, just for the sake of + showing a simple example. + + Example 1.4. Enable body compression +... + +#!KAMAILIO + +debug=3 +memdbg=5 +memlog=5 + +children=2 + +log_stderror=yes +listen=udp:127.0.0.1:5060 +listen=tcp:127.0.0.1:5060 + +tcp_accept_no_cl=yes +http_reply_parse=yes + +mpath="modules/" + +loadmodule "sl.so" +loadmodule "pv.so" +loadmodule "xlog.so" +loadmodule "corex.so" +loadmodule "textops.so" +loadmodule "xhttp.so" +loadmodule "gzcompress.so" + +modparam("gzcompress", "header_value", "deflate") + +request_route { + xlog("received sip request from $si:$sp\r\n"); + + if(src_port==5060) { + remove_hf("Content-Encoding"); + $du = "sip:127.0.0.1:9"; + } else { + append_hf("Content-Encoding: gzip\r\n"); + $du = "sip:127.0.0.1:5060"; + } + forward(); + exit; +} + +event_route[xhttp:request] { + xlog("received http request from $si:$sp\r\n"); + append_to_reply("Content-Encoding: deflate\r\n"); + xhttp_reply("200", "OK", "text/html", + "<html><body>OK - [$si:$sp]</body></html>"); +} + +... diff --git a/modules/gzcompress/doc/gzcompress_admin.xml b/modules/gzcompress/doc/gzcompress_admin.xml index f7a91b0..5917e7b 100644 --- a/modules/gzcompress/doc/gzcompress_admin.xml +++ b/modules/gzcompress/doc/gzcompress_admin.xml @@ -18,7 +18,8 @@ <para> This module is able to detect compressed body in received SIP message and decompress it as well as compress the body for outgoing SIP - message. + message. It works also for received HTTP request and replied HTTP + response (&kamailio; cannot work in HTTP proxy mode). </para> <para> The decision of whether to do compression or decompression is made @@ -161,5 +162,70 @@ modparam("gzcompress", "sanity_checks", 1) </para> </section> </section> + <section> + <title>Config File</title> + <para> + Next example shows how to enable compression for forwarded requests, + as well as replying with compressed body for HTTP requests. For SIP, + the request is recevied and forwarded to itself once, just for the + sake of showing a simple example. + </para> + <example> + <title>Enable body compression</title> + <programlisting format="linespecific"> +... +<![CDATA[ +#!KAMAILIO + +debug=3 +memdbg=5 +memlog=5 + +children=2 + +log_stderror=yes +listen=udp:127.0.0.1:5060 +listen=tcp:127.0.0.1:5060 + +tcp_accept_no_cl=yes +http_reply_parse=yes + +mpath="modules/" + +loadmodule "sl.so" +loadmodule "pv.so" +loadmodule "xlog.so" +loadmodule "corex.so" +loadmodule "textops.so" +loadmodule "xhttp.so" +loadmodule "gzcompress.so" + +modparam("gzcompress", "header_value", "deflate") + +request_route { + xlog("received sip request from $si:$sp\r\n"); + + if(src_port==5060) { + remove_hf("Content-Encoding"); + $du = "sip:127.0.0.1:9"; + } else { + append_hf("Content-Encoding: gzip\r\n"); + $du = "sip:127.0.0.1:5060"; + } + forward(); + exit; +} + +event_route[xhttp:request] { + xlog("received http request from $si:$sp\r\n"); + append_to_reply("Content-Encoding: deflate\r\n"); + xhttp_reply("200", "OK", "text/html", + "<html><body>OK - [$si:$sp]</body></html>"); +} +]]> +... +</programlisting> + </example> + </section> </chapter>

1 0

git:master: gzcompress: default encoding header value set to deflate
by Daniel-Constantin Mierla 23 Sep '13

23 Sep '13

Module: sip-router Branch: master Commit: d1263e418b7acbcc6ac798e25fc8bbcd8483fcec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1263e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 23 18:49:06 2013 +0200 gzcompress: default encoding header value set to deflate - it is what UA use for this zlib compression algorithm --- modules/gzcompress/gzcompress_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/gzcompress/gzcompress_mod.c b/modules/gzcompress/gzcompress_mod.c index a681aa8..7927e03 100644 --- a/modules/gzcompress/gzcompress_mod.c +++ b/modules/gzcompress/gzcompress_mod.c @@ -63,7 +63,7 @@ int gzc_msg_sent(void *data); /** module parameters */ static str _gzc_hdr_name = str_init("Content-Encoding"); -static str _gzc_hdr_value = str_init("gzip"); +static str _gzc_hdr_value = str_init("deflate"); static int _gzc_sanity_checks = 0; static sanity_api_t scb = {0};

1 0

git:master: core: aliased http_reply_hack to http_reply_parse
by Daniel-Constantin Mierla 23 Sep '13

23 Sep '13

Module: sip-router Branch: master Commit: adf32ec8b3e6329d1c75f158a11395a077fc54ea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=adf32ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 23 18:42:54 2013 +0200 core: aliased http_reply_hack to http_reply_parse - a more relevant name for the core parameter that enables parsing http replies --- cfg.lex | 6 +++--- cfg.y | 6 +++--- globals.h | 2 +- parser/parse_fline.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cfg.lex b/cfg.lex index 053fa2e..127fce5 100644 --- a/cfg.lex +++ b/cfg.lex @@ -476,7 +476,7 @@ KILL_TIMEOUT "exit_timeout"|"ser_kill_timeout" MAX_WLOOPS "max_while_loops" PVBUFSIZE "pv_buffer_size" PVBUFSLOTS "pv_buffer_slots" -HTTP_REPLY_HACK "http_reply_hack" +HTTP_REPLY_PARSE "http_reply_hack"|"http_reply_parse" VERSION_TABLE_CFG "version_table" SERVER_ID "server_id" @@ -910,8 +910,8 @@ IMPORTFILE "import_file" return PVBUFSIZE; } <INITIAL>{PVBUFSLOTS} { count(); yylval.strval=yytext; return PVBUFSLOTS; } -<INITIAL>{HTTP_REPLY_HACK} { count(); yylval.strval=yytext; - return HTTP_REPLY_HACK; } +<INITIAL>{HTTP_REPLY_PARSE} { count(); yylval.strval=yytext; + return HTTP_REPLY_PARSE; } <INITIAL>{VERSION_TABLE_CFG} { count(); yylval.strval=yytext; return VERSION_TABLE_CFG;} <INITIAL>{SERVER_ID} { count(); yylval.strval=yytext; return SERVER_ID;} <INITIAL>{LATENCY_LOG} { count(); yylval.strval=yytext; return LATENCY_LOG;} diff --git a/cfg.y b/cfg.y index 5f88d13..3b7fbdd 100644 --- a/cfg.y +++ b/cfg.y @@ -531,7 +531,7 @@ extern char *finame; %token MAX_WLOOPS %token PVBUFSIZE %token PVBUFSLOTS -%token HTTP_REPLY_HACK +%token HTTP_REPLY_PARSE %token VERSION_TABLE_CFG %token CFG_DESCRIPTION %token SERVER_ID @@ -1553,8 +1553,8 @@ assign_stm: | PVBUFSIZE EQUAL error { yyerror("number expected"); } | PVBUFSLOTS EQUAL NUMBER { pv_set_buffer_slots($3); } | PVBUFSLOTS EQUAL error { yyerror("number expected"); } - | HTTP_REPLY_HACK EQUAL NUMBER { http_reply_hack=$3; } - | HTTP_REPLY_HACK EQUAL error { yyerror("boolean value expected"); } + | HTTP_REPLY_PARSE EQUAL NUMBER { http_reply_parse=$3; } + | HTTP_REPLY_PARSE EQUAL error { yyerror("boolean value expected"); } | SERVER_ID EQUAL NUMBER { server_id=$3; } | LATENCY_LOG EQUAL NUMBER { default_core_cfg.latency_log=$3; } | LATENCY_LOG EQUAL error { yyerror("number expected"); } diff --git a/globals.h b/globals.h index a16f581..b535ca8 100644 --- a/globals.h +++ b/globals.h @@ -206,7 +206,7 @@ extern int rt_timer2_prio; /* "slow" timer */ extern int rt_timer1_policy; /* "fast" timer, SCHED_OTHER */ extern int rt_timer2_policy; /* "slow" timer, SCHED_OTHER */ -extern int http_reply_hack; +extern int http_reply_parse; #ifdef USE_DNS_CACHE extern int dns_cache_init; /* if 0, the DNS cache is not initialized at startup */ diff --git a/parser/parse_fline.c b/parser/parse_fline.c index 54da8c5..8dacfe5 100644 --- a/parser/parse_fline.c +++ b/parser/parse_fline.c @@ -45,7 +45,7 @@ #include "../mem/mem.h" #include "../ut.h" -int http_reply_hack = 0; +int http_reply_parse = 0; /* grammar: request = method SP uri SP version CRLF @@ -98,7 +98,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl) fl->type=SIP_REPLY; fl->u.reply.version.len=SIP_VERSION_LEN; tmp=buffer+SIP_VERSION_LEN; - } else if (http_reply_hack != 0 && + } else if (http_reply_parse != 0 && (*tmp=='H' || *tmp=='h') && /* 'HTTP/1.' */ strncasecmp( tmp+1, HTTP_VERSION+1, HTTP_VERSION_LEN-1)==0 &&

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2013