sr-dev October 2010

sr-dev@lists.kamailio.org

33 participants
336 discussions

git:master: modules/auth: fixed sending of [www|proxy]_challenge reply
by Juha Heinanen 07 Oct '10

07 Oct '10

Module: sip-router Branch: master Commit: c53bc97968e4ac2ddf5b8a23af44942e8d50e7b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c53bc97… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Oct 7 17:59:27 2010 +0300 modules/auth: fixed sending of [www|proxy]_challenge reply - By default, [www|proxy]_challenge functions now send reply statefully if transaction exists and statelessly otherwise. - Added force_stateless_reply module param that can be used to change the default behavior. - Credits to Andrei Pelinescu-Onciul. --- modules/auth/README | 29 ++++++++++++++++++++++------- modules/auth/auth_mod.c | 12 ++++++++++-- modules/auth/doc/functions.xml | 6 ++++-- modules/auth/doc/params.xml | 19 +++++++++++++++++++ 4 files changed, 55 insertions(+), 11 deletions(-) diff --git a/modules/auth/README b/modules/auth/README index 92e4641..0f0214b 100644 --- a/modules/auth/README +++ b/modules/auth/README @@ -36,6 +36,7 @@ Daniel-Constantin Mierla 1.3.10. secret (string) 1.3.11. nonce_expire (integer) 1.3.12. nonce_auth_max_drift (integer) + 1.3.13. force_stateless_reply (boolean) 1.4. Functions @@ -450,6 +451,18 @@ modparam("auth", "nonce_expire", 600) # Set nonce_expire to 600s modparam("auth", "nonce_auth_max_drift", 1) # set max drift to 1 s ... +1.3.13. force_stateless_reply (boolean) + + If set to 1, www_challenge() and proxy_challenge() functions send reply + statelessly no matter if transaction exists or not. If set to 0 + (default), reply is sent statefully if transaction exists and + stelelessly otherwise. + + Example 13. force_stateless_reply example +... +modparam("auth", "force_stateless_reply", 1) +... + 1.4. Functions 1.4.1. consume_credentials() @@ -462,7 +475,7 @@ modparam("auth", "nonce_auth_max_drift", 1) # set max drift to 1 s little bit shorter. The function must be called after www_authorize, proxy_authorize, www_authenticate or proxy_authenticate. - Example 13. consume_credentials example + Example 14. consume_credentials example ... if (www_authenticate("realm", "subscriber)) { consume_credentials(); @@ -476,7 +489,8 @@ if (www_authenticate("realm", "subscriber)) { field into a response generated from the request the server is processing and send the reply. Upon reception of such a reply the user agent should compute credentials and retry the request. For more - information regarding digest authentication see RFC2617. + information regarding digest authentication see RFC2617. See module + parameter force_stateless_reply regarding sending of the reply. Meaning of the parameters is as follows: * realm - Realm is a opaque string that the user agent should present @@ -496,7 +510,7 @@ if (www_authenticate("realm", "subscriber)) { This function can be used from REQUEST_ROUTE. - Example 14. www_challenge usage + Example 15. www_challenge usage ... if (!www_authenticate("$td", "subscriber")) { www_challenge("$td", "1"); @@ -510,14 +524,15 @@ if (!www_authenticate("$td", "subscriber")) { the header field into a response generated from the request the server is processing and send the reply. Upon reception of such a reply the user agent should compute credentials and retry the request. For more - information regarding digest authentication see RFC2617. + information regarding digest authentication see RFC2617. See module + parameter force_stateless_reply regarding sending of the reply. Meaning of the parameters the same as for function www_challenge(realm, flags) This function can be used from REQUEST_ROUTE. - Example 15. proxy_challenge usage + Example 16. proxy_challenge usage ... if (!proxy_authenticate("$fd", "subscriber)) { proxy_challenge("$fd", "1"); @@ -562,7 +577,7 @@ if (!proxy_authenticate("$fd", "subscriber)) { This function can be used from REQUEST_ROUTE. - Example 16. pv_www_authenticate usage + Example 17. pv_www_authenticate usage ... if (!pv_www_authenticate("$td", "123abc", "0")) { www_challenge("$td", "1"); @@ -584,7 +599,7 @@ if (!pv_www_authenticate("$td", "123abc", "0")) { This function can be used from REQUEST_ROUTE. - Example 17. pv_proxy_authenticate usage + Example 18. pv_proxy_authenticate usage ... $avp(password)="xyz"; if (!pv_proxy_authenticate("$fd", "$avp(password)", "0")) { diff --git a/modules/auth/auth_mod.c b/modules/auth/auth_mod.c index f75530b..b30f6b8 100644 --- a/modules/auth/auth_mod.c +++ b/modules/auth/auth_mod.c @@ -97,6 +97,7 @@ char* sec_param = 0; /* If the parameter was not used, the secret phrase int nonce_expire = 300; /* Nonce lifetime */ /*int auth_extra_checks = 0; -- in nonce.c */ int protect_contacts = 0; /* Do not include contacts in nonce by default */ +int force_stateless_reply = 0; /* Always send reply statelessly */ str secret1; str secret2; @@ -171,7 +172,7 @@ static param_export_t params[] = { {"one_time_nonce" , PARAM_INT, &otn_enabled }, {"otn_in_flight_no", PARAM_INT, &otn_in_flight_no }, {"otn_in_flight_order", PARAM_INT, &otn_in_flight_k }, - {"nid_pool_no", PARAM_INT, &nid_pool_no }, + {"force_stateless_reply", PARAM_INT, &force_stateless_reply }, {0, 0, 0} }; @@ -558,6 +559,8 @@ static int fixup_pv_auth(void **param, int param_no) static int auth_send_reply(struct sip_msg *msg, int code, char *reason, char *hdr, int hdr_len) { + str reason_str; + /* Add new headers if there are any */ if ((hdr!=NULL) && (hdr_len>0)) { if (add_lump_rpl(msg, hdr, hdr_len, LUMP_RPL_HDR)==0) { @@ -566,7 +569,12 @@ static int auth_send_reply(struct sip_msg *msg, int code, char *reason, } } - return slb.zreply(msg, code, reason); + reason_str.s = reason; + reason_str.len = strlen(reason); + + return force_stateless_reply ? + slb.sreply(msg, code, &reason_str) : + slb.freply(msg, code, &reason_str); } /** diff --git a/modules/auth/doc/functions.xml b/modules/auth/doc/functions.xml index 90f4c93..b9816bc 100644 --- a/modules/auth/doc/functions.xml +++ b/modules/auth/doc/functions.xml @@ -42,7 +42,8 @@ if (www_authenticate("realm", "subscriber)) { server is processing and send the reply. Upon reception of such a reply the user agent should compute credentials and retry the request. For more information regarding digest authentication - see RFC2617. + see RFC2617. See module parameter force_stateless_reply + regarding sending of the reply. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -109,7 +110,8 @@ if (!www_authenticate("$td", "subscriber")) { put the header field into a response generated from the request the server is processing and send the reply. Upon reception of such a reply the user agent should compute credentials and retry the request. - For more information regarding digest authentication see RFC2617. + For more information regarding digest authentication see RFC2617. See module parameter force_stateless_reply + regarding sending of the reply. </para> <para>Meaning of the parameters the same as for function www_challenge(realm, flags)</para> diff --git a/modules/auth/doc/params.xml b/modules/auth/doc/params.xml index ad84251..67c83bb 100644 --- a/modules/auth/doc/params.xml +++ b/modules/auth/doc/params.xml @@ -572,4 +572,23 @@ modparam("auth", "nonce_auth_max_drift", 1) # set max drift to 1 s </programlisting> </example> </section> + + <section id="force_stateless_reply"> + <title><varname>force_stateless_reply</varname> (boolean)</title> + <para> + If set to 1, <function>www_challenge()</function> and + <function>proxy_challenge()</function> + functions send reply statelessly no matter if transaction + exists or not. If set to 0 (default), reply is sent statefully + if transaction exists and stelelessly otherwise. + </para> + <example> + <title>force_stateless_reply example</title> + <programlisting> +... +modparam("auth", "force_stateless_reply", 1) +... + </programlisting> + </example> + </section> </section>

1 0

3.1 crashes in topoh on receiving 180 message
by Andrew Pogrebennyk 07 Oct '10

07 Oct '10

I'm trying to get Kamailio 3.1 running with topoh module. It crashes in topoh trying to decode tha param. I can post the config file, but there's nothing special to it. The only non-default topoh parameter is: modparam("topoh", "mask_ip", "93.153.XX.YY") SIP trace and backtrace below: ### U 92.249.89.223:6230 -> 93.153.XX.YY:5060 INVITE sip:000100@93.153.XX.YY SIP/2.0. Via: SIP/2.0/UDP 192.168.178.12:6230;branch=z9hG4bK-d87543-0930b618257c1d55-1--d87543-;rport. Max-Forwards: 70. Contact: <sip:000101@92.249.89.223:6230>. To: "000100"<sip:000100@93.153.XX.YY>. From: <sip:000101@93.153.XX.YY>;tag=b303951e. Call-ID: MzM4MjZjZDM4OTQwMmMwNGZjYzFkNTI3MmU1NDVlZmM.. CSeq: 1 INVITE. Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO. Content-Type: application/sdp. User-Agent: eyeBeam release 1004p stamp 31962. Content-Length: 418. . v=0. o=- 6 2 IN IP4 192.168.178.12. s=CounterPath eyeBeam 1.5. c=IN IP4 192.168.178.12. t=0 0. m=audio 44918 RTP/AVP 100 106 0 105 8 18 3 101. a=alt:1 1 : QL7njyiY VHqTwP03 192.168.178.12 44918. a=fmtp:18 annexb=no. a=fmtp:101 0-15. a=rtpmap:100 SPEEX/16000. a=rtpmap:106 SPEEX-FEC/16000. a=rtpmap:105 SPEEX-FEC/8000. a=rtpmap:101 telephone-event/8000. a=sendrecv. a=x-rtp-session-id:76338B1C724D41F7A127A1B9B22289AD. # U 93.153.XX.YY:5060 -> 92.249.89.223:6230 SIP/2.0 407 Proxy Authentication Required. Via: SIP/2.0/UDP 192.168.178.12:6230;branch=z9hG4bK-d87543-0930b618257c1d55-1--d87543-;rport=6230;received=92.249.89.223. To: "000100"<sip:000100@93.153.XX.YY>;tag=4d95499f1ae46b3876f6ef53ea0a0dda.de06. From: <sip:000101@93.153.XX.YY>;tag=b303951e. Call-ID: MzM4MjZjZDM4OTQwMmMwNGZjYzFkNTI3MmU1NDVlZmM.. CSeq: 1 INVITE. Proxy-Authenticate: Digest realm="93.153.XX.YY", nonce="TK27+0ytus+K89lx697qgg525SrCrkhJ". Server: kamailio (3.1.0 (i386/linux)). Content-Length: 0. . # U 92.249.89.223:6230 -> 93.153.XX.YY:5060 ACK sip:000100@93.153.XX.YY SIP/2.0. Via: SIP/2.0/UDP 192.168.178.12:6230;branch=z9hG4bK-d87543-0930b618257c1d55-1--d87543-;rport. To: "000100"<sip:000100@93.153.XX.YY>;tag=4d95499f1ae46b3876f6ef53ea0a0dda.de06. From: <sip:000101@93.153.XX.YY>;tag=b303951e. Call-ID: MzM4MjZjZDM4OTQwMmMwNGZjYzFkNTI3MmU1NDVlZmM.. CSeq: 1 ACK. Content-Length: 0. . # U 92.249.89.223:6230 -> 93.153.XX.YY:5060 INVITE sip:000100@93.153.XX.YY SIP/2.0. Via: SIP/2.0/UDP 192.168.178.12:6230;branch=z9hG4bK-d87543-17045a5007352948-1--d87543-;rport. Max-Forwards: 70. Contact: <sip:000101@92.249.89.223:6230>. To: "000100"<sip:000100@93.153.XX.YY>. From: <sip:000101@93.153.XX.YY>;tag=b303951e. Call-ID: MzM4MjZjZDM4OTQwMmMwNGZjYzFkNTI3MmU1NDVlZmM.. CSeq: 2 INVITE. Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO. Content-Type: application/sdp. Proxy-Authorization: Digest username="000101",realm="93.153.XX.YY",nonce="TK27+0ytus+K89lx697qgg525SrCrkhJ",uri="sip:000100@93.153.XX.YY",response="34168da59da06a2850f5910db9379101",algorithm=MD5. User-Agent: eyeBeam release 1004p stamp 31962. Content-Length: 418. . v=0. o=- 6 2 IN IP4 192.168.178.12. s=CounterPath eyeBeam 1.5. c=IN IP4 192.168.178.12. t=0 0. m=audio 44918 RTP/AVP 100 106 0 105 8 18 3 101. a=alt:1 1 : QL7njyiY VHqTwP03 192.168.178.12 44918. a=fmtp:18 annexb=no. a=fmtp:101 0-15. a=rtpmap:100 SPEEX/16000. a=rtpmap:106 SPEEX-FEC/16000. a=rtpmap:105 SPEEX-FEC/8000. a=rtpmap:101 telephone-event/8000. a=sendrecv. a=x-rtp-session-id:76338B1C724D41F7A127A1B9B22289AD. # U 93.153.XX.YY:5060 -> 92.249.89.223:6230 SIP/2.0 100 trying -- your call is important to us. Via: SIP/2.0/UDP 192.168.178.12:6230;branch=z9hG4bK-d87543-17045a5007352948-1--d87543-;rport=6230;received=92.249.89.223. To: "000100"<sip:000100@93.153.XX.YY>. From: <sip:000101@93.153.XX.YY>;tag=b303951e. Call-ID: MzM4MjZjZDM4OTQwMmMwNGZjYzFkNTI3MmU1NDVlZmM.. CSeq: 2 INVITE. Server: kamailio (3.1.0 (i386/linux)). Content-Length: 0. . # U 93.153.XX.YY:5060 -> 92.249.89.223:35138 INVITE sip:000100@192.168.178.12:35138;rinstance=a6126869b246d3ae SIP/2.0. Record-Route: <sip:93.153.XX.YY;lr=on;ftag=b303951e>. Via: SIP/2.0/UDP 93.153.XX.YY;branch=z9hG4bK1d7a.07d27eb2.0. Via: SIP/2.0/UDP 93.153.XX.YY;branch=z9hG4bKsr-j4IPOlV7MGQKatycM.qLOBF6zGZfWlc7M.V-WBVlMx1LgRWIC9gIgx4sMJZLWxq7zxq7MBVlzuaVHRaYpB1JNEt736cQkBIvalaJmLuqzxNuWxM1M.NAWxKrW.yAWlMuMBq4zG4fOmuqzxNuWxM1zweAowe4H.3LMly*. Max-Forwards: 69. Contact: <sip:93.153.XX.YY;line=sr-N6IAzByAMxFAMjysMJZLWxq7zxq7MBVlzB3LMly*>. To: "000100"<sip:000100@93.153.XX.YY>. From: <sip:000101@93.153.XX.YY>;tag=b303951e. Call-ID: MzM4MjZjZDM4OTQwMmMwNGZjYzFkNTI3MmU1NDVlZmM.. CSeq: 2 INVITE. Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO. Content-Type: application/sdp. User-Agent: eyeBeam release 1004p stamp 31962. Content-Length: 418. . v=0. o=- 6 2 IN IP4 192.168.178.12. s=CounterPath eyeBeam 1.5. c=IN IP4 192.168.178.12. t=0 0. m=audio 44918 RTP/AVP 100 106 0 105 8 18 3 101. a=alt:1 1 : QL7njyiY VHqTwP03 192.168.178.12 44918. a=fmtp:18 annexb=no. a=fmtp:101 0-15. a=rtpmap:100 SPEEX/16000. a=rtpmap:106 SPEEX-FEC/16000. a=rtpmap:105 SPEEX-FEC/8000. a=rtpmap:101 telephone-event/8000. a=sendrecv. a=x-rtp-session-id:76338B1C724D41F7A127A1B9B22289AD. # U 92.249.89.223:35138 -> 93.153.XX.YY:5060 SIP/2.0 180 Ringing. Via: SIP/2.0/UDP 93.153.XX.YY;branch=z9hG4bK1d7a.07d27eb2.0. Via: SIP/2.0/UDP 93.153.XX.YY;branch=z9hG4bKsr-j4IPOlV7MGQKatycM.qLOBF6zGZfWlc7M.V-WBVlMx1LgRWIC9gIgx4sMJZLWxq7zxq7MBVlzuaVHRaYpB1JNEt736cQkBIvalaJmLuqzxNuWxM1M.NAWxKrW.yAWlMuMBq4zG4fOmuqzxNuWxM1zweAowe4H.3LMly*. Record-Route: <sip:93.153.XX.YY;lr;ftag=b303951e>. Contact: <sip:000100@192.168.178.12:35138;rinstance=a6126869b246d3ae>. To: "000100"<sip:000100@93.153.XX.YY>;tag=f72a6127. From: <sip:000101@93.153.XX.YY>;tag=b303951e. Call-ID: MzM4MjZjZDM4OTQwMmMwNGZjYzFkNTI3MmU1NDVlZmM.. CSeq: 2 INVITE. User-Agent: X-Lite release 1104o stamp 56125. Content-Length: 0. . (gdb) backtrace #0 0x00e1b990 in th_mask_decode (in=0x0, ilen=0, prefix=0xe262a8, extra=0, olen=0xbfffdd94) at th_mask.c:141 #1 0x00e21602 in th_flip_record_route (msg=0xbfffdde0, mode=0) at th_msg.c:546 #2 0x00e23c61 in th_msg_received (data=0xbfffe214) at topoh_mod.c:235 #3 0x080dc90b in receive_msg ( buf=0x82a7760 "SIP/2.0 180 Ringing\r\nVia: SIP/2.0/UDP 93.153.XX.YY;branch=z9hG4bKf6d6.a2e48be6.0\r\nVia: SIP/2.0/UDP 93.153.XX.YY;branch=z9hG4bKsr-j4IPOlV7MGQKatycM.qLOBF6zGZfWlc7M.V-WBVlMx1LgRWIC9gIgx4sMJZLWxq7zxq"..., len=663, rcv_info=0xbfffe2a8) at receive.c:117 #4 0x0816eef7 in udp_rcv_loop () at udp_server.c:532 #5 0x080ad9e1 in main_loop () at main.c:1554 #6 0x080b1126 in main (argc=2, argv=0xbfffe584) at main.c:2398 -- Sincerely, Andrew Pogrebennyk

2 2

Reseting a pseudo-variable for each new request/response
by Iñaki Baz Castillo 07 Oct '10

07 Oct '10

Hi, in a module I'm writting I export a script function which gives value to a new pseudo-variable. This pv is stored in a global variable into each worker process. I don't know how to solve this issue: - A request is handled by worker-1. - The script calls to the module function so the pv is filled (it's value is stored in a global str within the process). - Later in the script I can access to $new_pv (it reads the global str in the pv_get_new_pv() function). - The request processing ends (i.e: t_relay). - After some time the same worker-1 receives a new request. - If the script reads $new_pv (without calling the module function before) it will get the value generated during the previous SIP request. Of course the script configuration shouldn't try to read $new_pv without calling first to the exported function, but anyhow this could happen (due to a bad script file). Is there an ellegant way to avoid this? This is, I would like that when a process receives a request (or a response) $new_pv gets automatically reseted (to NULL), prior to executing the script logic. In this way accessing to $new_pv without calling the module function would return an empty value. Is it possible? how do other modules handle this case? Thanks a lot. -- Iñaki Baz Castillo <ibc(a)aliax.net>

2 3

git:3.1: modules/auth: fixed comment in nonce_count example
by Juha Heinanen 07 Oct '10

07 Oct '10

Module: sip-router Branch: 3.1 Commit: 405fb620d1bba43c159012772175f533a40a3a77 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=405fb62… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Oct 7 15:57:27 2010 +0300 modules/auth: fixed comment in nonce_count example --- modules/auth/README | 6 ++++-- modules/auth/doc/params.xml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/auth/README b/modules/auth/README index e70cf07..92e4641 100644 --- a/modules/auth/README +++ b/modules/auth/README @@ -194,8 +194,10 @@ modparam("auth", "qop", "auth") # enable qop=auth route{ ... # go stateful and catch retransmissions - if (!t_newtran()) - drop; # retransmission + if (!t_newtran()) { + xlog("L_NOTICE", "Failed to create new transaction\n"); + drop; + }; if (method=="REGISTER"){ if (!www_authenticate("test", "credentials")){ # reply must be sent with t_reply because the diff --git a/modules/auth/doc/params.xml b/modules/auth/doc/params.xml index af44e2a..ad84251 100644 --- a/modules/auth/doc/params.xml +++ b/modules/auth/doc/params.xml @@ -194,8 +194,10 @@ modparam("auth", "qop", "auth") # enable qop=auth route{ ... # go stateful and catch retransmissions - if (!t_newtran()) - drop; # retransmission + if (!t_newtran()) { + xlog("L_NOTICE", "Failed to create new transaction\n"); + drop; + }; if (method=="REGISTER"){ if (!www_authenticate("test", "credentials")){ # reply must be sent with t_reply because the

1 0

git:master: modules/auth: fixed comment in nonce_count example
by Juha Heinanen 07 Oct '10

07 Oct '10

Module: sip-router Branch: master Commit: d5634f0e2e9f25395e312a98aa6814d78e39b16f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d5634f0… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Oct 7 15:57:27 2010 +0300 modules/auth: fixed comment in nonce_count example --- modules/auth/README | 6 ++++-- modules/auth/doc/params.xml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/auth/README b/modules/auth/README index e70cf07..92e4641 100644 --- a/modules/auth/README +++ b/modules/auth/README @@ -194,8 +194,10 @@ modparam("auth", "qop", "auth") # enable qop=auth route{ ... # go stateful and catch retransmissions - if (!t_newtran()) - drop; # retransmission + if (!t_newtran()) { + xlog("L_NOTICE", "Failed to create new transaction\n"); + drop; + }; if (method=="REGISTER"){ if (!www_authenticate("test", "credentials")){ # reply must be sent with t_reply because the diff --git a/modules/auth/doc/params.xml b/modules/auth/doc/params.xml index af44e2a..ad84251 100644 --- a/modules/auth/doc/params.xml +++ b/modules/auth/doc/params.xml @@ -194,8 +194,10 @@ modparam("auth", "qop", "auth") # enable qop=auth route{ ... # go stateful and catch retransmissions - if (!t_newtran()) - drop; # retransmission + if (!t_newtran()) { + xlog("L_NOTICE", "Failed to create new transaction\n"); + drop; + }; if (method=="REGISTER"){ if (!www_authenticate("test", "credentials")){ # reply must be sent with t_reply because the

1 0

git:tirpi/cfg_framework_multivalue: ctl: rpc-> scan does not immediately send out errors
by Miklos Tirpak 07 Oct '10

07 Oct '10

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 77576163bacf3d25ba5694563df173ce2aa4aa5f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7757616… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Oct 5 16:09:27 2010 +0200 ctl: rpc->scan does not immediately send out errors When the rpc scan function cannot read a parameter because of a type mismatch, the function only prepares the error reply but does not send it out immediately. The scan can be retried with different parameter specification which resets the prepared error message. This allows variable types of parameters of the same rpc function, for example: if (rpc->scan(c, "d", &i) == 1) /* int parameter */ else if (rpc->scan(c, "s", &ch) == 1) /* char* parameter */ else return /* error */ --- modules/ctl/binrpc_run.c | 124 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 99 insertions(+), 25 deletions(-) diff --git a/modules/ctl/binrpc_run.c b/modules/ctl/binrpc_run.c index 989f889..4732c19 100644 --- a/modules/ctl/binrpc_run.c +++ b/modules/ctl/binrpc_run.c @@ -97,6 +97,8 @@ struct binrpc_ctx{ char* method; struct binrpc_gc_block* gc; /**< garbage collection */ int replied; + int err_code; + str err_phrase; /**< Leading zero must be included! */ }; @@ -388,6 +390,10 @@ inline void destroy_binrpc_ctx(struct binrpc_ctx* ctx) pkg_free(ctx->out.pkt.body); ctx->out.pkt.body=0; } + if (ctx->err_phrase.s){ + pkg_free(ctx->err_phrase.s); + ctx->err_phrase.s=NULL; + } binrpc_gc_collect(ctx); } @@ -395,32 +401,23 @@ inline void destroy_binrpc_ctx(struct binrpc_ctx* ctx) #define MAX_FAULT_LEN 256 #define FAULT_START_BUF (3 /* maxint*/+2/*max str header*/) -static void rpc_fault(struct binrpc_ctx* ctx, int code, char* fmt, ...) +static void _rpc_fault(struct binrpc_ctx* ctx, int code, + char *phrase, int phrase_len) { - char buf[MAX_FAULT_LEN]; static unsigned char fault_start[FAULT_START_BUF]; static unsigned char hdr[BINRPC_MAX_HDR_SIZE]; struct iovec v[3]; struct binrpc_pkt body; int b_len; - va_list ap; - int len; int hdr_len; int err; - + if (ctx->replied){ LOG(L_ERR, "ERROR: binrpc: rpc_send: rpc method %s tried to reply" " more then once\n", ctx->method?ctx->method:""); return; } err=0; - va_start(ap, fmt); - len=vsnprintf(buf, MAX_FAULT_LEN, fmt, ap); /* ignore trunc. errors */ - if ((len<0) || (len > MAX_FAULT_LEN)) - len=MAX_FAULT_LEN-1; - va_end(ap); - - len++; /* vnsprintf doesn't include the terminating 0 */ err=binrpc_init_pkt(&body, fault_start, FAULT_START_BUF); if (err<0){ LOG(L_ERR, "ERROR: binrpc_init_pkt error\n"); @@ -429,22 +426,22 @@ static void rpc_fault(struct binrpc_ctx* ctx, int code, char* fmt, ...) /* adding a fault "manually" to avoid extra memcpys */ err=binrpc_addint(&body, code); if (err<0){ - LOG(L_ERR, "ERROR: rpc_fault: addint error\n"); + LOG(L_ERR, "ERROR: _rpc_fault: addint error\n"); goto error; } - err=binrpc_add_str_mark(&body, BINRPC_T_STR, len); + err=binrpc_add_str_mark(&body, BINRPC_T_STR, phrase_len); if (err<0){ - LOG(L_ERR, "ERROR: rpc_fault: add_str_mark error\n"); + LOG(L_ERR, "ERROR: _rpc_fault: add_str_mark error\n"); goto error; } /* - err=binrpc_addfault(&body, code, buf, len); + err=binrpc_addfault(&body, code, phrase, phrase_len); if (err<0){ LOG(L_ERR, "ERROR: binrpc_addfault error\n"); goto error; }*/ b_len=binrpc_pkt_len(&body); - err=hdr_len=binrpc_build_hdr(BINRPC_FAULT, b_len+len, + err=hdr_len=binrpc_build_hdr(BINRPC_FAULT, b_len+phrase_len, ctx->in.ctx.cookie, hdr, BINRPC_MAX_HDR_SIZE); if (err<0){ LOG(L_ERR, "ERROR: binrpc_build_hdr error\n"); @@ -454,25 +451,90 @@ static void rpc_fault(struct binrpc_ctx* ctx, int code, char* fmt, ...) v[0].iov_len=hdr_len; v[1].iov_base=body.body; v[1].iov_len=b_len; - v[2].iov_base=buf; - v[2].iov_len=len; + v[2].iov_base=phrase; + v[2].iov_len=phrase_len; if ((err=sock_send_v(ctx->send_h, v, 3))<0){ if (err==-2){ - LOG(L_ERR, "ERROR: binrpc_fault: send failed: " + LOG(L_ERR, "ERROR: _rpc_fault: send failed: " "datagram too big\n"); return; } - LOG(L_ERR, "ERROR: binrpc_fault: send failed\n"); + LOG(L_ERR, "ERROR: _rpc_fault: send failed\n"); return; } ctx->replied=1; return; error: - LOG(L_ERR, "ERROR: binrpc_fault: binrpc_* failed with: %s (%d)\n", + LOG(L_ERR, "ERROR: _rpc_fault: binrpc_* failed with: %s (%d)\n", binrpc_error(err), err); } +static void rpc_fault(struct binrpc_ctx* ctx, int code, char* fmt, ...) +{ + char buf[MAX_FAULT_LEN]; + va_list ap; + int len; + if (ctx->replied){ + LOG(L_ERR, "ERROR: binrpc: rpc_send: rpc method %s tried to reply" + " more then once\n", ctx->method?ctx->method:""); + return; + } + va_start(ap, fmt); + len=vsnprintf(buf, MAX_FAULT_LEN, fmt, ap); /* ignore trunc. errors */ + if ((len<0) || (len > MAX_FAULT_LEN)) + len=MAX_FAULT_LEN-1; + va_end(ap); + + len++; /* vnsprintf doesn't include the terminating 0 */ + return _rpc_fault(ctx, code, buf, len); +} + +/* Prepare the error reply without sending out the message */ +static int rpc_fault_prepare(struct binrpc_ctx* ctx, int code, char* fmt, ...) +{ + char buf[MAX_FAULT_LEN]; + va_list ap; + int len; + + if (ctx->replied){ + LOG(L_ERR, "ERROR: binrpc: rpc_send: rpc method %s tried to reply" + " more then once\n", ctx->method?ctx->method:""); + return -1; + } + va_start(ap, fmt); + len=vsnprintf(buf, MAX_FAULT_LEN, fmt, ap); /* ignore trunc. errors */ + if ((len<0) || (len > MAX_FAULT_LEN)) + len=MAX_FAULT_LEN-1; + va_end(ap); + + len++; /* vnsprintf doesn't include the terminating 0 */ + + ctx->err_code = code; + if (ctx->err_phrase.s) + pkg_free(ctx->err_phrase.s); + ctx->err_phrase.s = (char*)pkg_malloc(sizeof(char)*len); + if (!ctx->err_phrase.s) { + ctx->err_code = 0; + ctx->err_phrase.len = 0; + LOG(L_ERR, "ERROR: rpc_fault_prepare: not enough memory\n"); + return -1; + } + memcpy(ctx->err_phrase.s, buf, len); + ctx->err_phrase.len = len; + return 0; +} + +/* Reset the saved error code */ +static void rpc_fault_reset(struct binrpc_ctx* ctx) +{ + ctx->err_code = 0; + if (ctx->err_phrase.s) { + pkg_free(ctx->err_phrase.s); + ctx->err_phrase.s = NULL; + ctx->err_phrase.len = 0; + } +} /* build the reply from the current body */ static int rpc_send(struct binrpc_ctx* ctx) @@ -596,14 +658,21 @@ int process_rpc_req(unsigned char* buf, int size, int* bytes_needed, f_ctx.method=val.u.strval.s; rpc_e->function(&binrpc_callbacks, &f_ctx); if (f_ctx.replied==0){ + if ((binrpc_pkt_len(&f_ctx.out.pkt)==0) + && f_ctx.err_code && f_ctx.err_phrase.s + ) { + _rpc_fault(&f_ctx, f_ctx.err_code, + f_ctx.err_phrase.s, f_ctx.err_phrase.len); /* to get an error reply if the rpc handlers hasn't replied * uncomment the following code: - * if (binrpc_pkt_len(&f_ctx.out.pkt)==0){ + * } else if (binrpc_pkt_len(&f_ctx.out.pkt)==0){ rpc_fault(&f_ctx, 500, "internal server error: no reply"); LOG(L_ERR, "ERROR: rpc method %s hasn't replied\n", val.u.strval.s); - }else */ + */ + } else { rpc_send(&f_ctx); + } } end: *bytes_needed=0; /* full read */ @@ -749,6 +818,9 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) double d; str* s; + /* clear the previously saved error code */ + rpc_fault_reset(ctx); + va_start(ap, fmt); orig_fmt=fmt; nofault = 0; @@ -823,8 +895,10 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) va_end(ap); return (int)(fmt-orig_fmt)-modifiers; error_read: + /* Do not immediately send out the error message, the user might retry the scan with + different parameters */ if(nofault==0 || ((err!=E_BINRPC_MORE_DATA) && (err!=E_BINRPC_EOP))) - rpc_fault(ctx, 400, "error at parameter %d: expected %s type but" + rpc_fault_prepare(ctx, 400, "error at parameter %d: expected %s type but" " %s", ctx->in.record_no, rpc_type_name(v.type), binrpc_error(err)); /*

2 3

[ openser-Feature Requests-3082812 ] comment2, zolpidem, winston cigarette adatives, allopurinol
by SourceForge.net 07 Oct '10

07 Oct '10

Feature Requests item #3082812, was opened at 2010-10-07 08:30 Message generated for change (Tracker Item Submitted) made by nobody You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743023&aid=3082812&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: core Group: ver devel Status: Open Resolution: None Priority: 5 Private: No Submitted By: Nobody/Anonymous (nobody) Assigned to: Nobody/Anonymous (nobody) Summary: comment2, zolpidem, winston cigarette adatives, allopurinol Initial Comment: comment2, zolpidem, winston cigarette adatives, allopurinol without prescription, ultram, alprazolam, pall mall cigarettes, propranolol used, adult dating sites, breastfeed and metformin, reductil, boards cat prednisone, dunhill international cigarettes, baclofen side effects, christian dating website singles, dunhill menthol cigarettes, lipitor, book buy de fluoxetine guest site, female spray viagra, ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743023&aid=3082812&group_…

3 2

tls warning
by Juha Heinanen 07 Oct '10

07 Oct '10

when i start sr, i get this warning: Oct 2 12:13:12 sip /usr/sbin/sip-proxy[10603]: WARNING: tls [tls_init.c:592]: init_tls_h(): tls: ser compiled without MALLOC_STATS support: the workaround for low mem. openssl bugs will _not_ work if TLS is enabled when sr is build, would it be possible to automatically compile it also with MALLOC_STATS support so that the workaround would work? -- juha

2 1

org name in server/client certificate
by Juha Heinanen 07 Oct '10

07 Oct '10

tls module README says: Creating a server/client certificate ------------------------------------ 1. create a certificate request (and its private key in privkey.pem) openssl req -out ser1_cert_req.pem -new -nodes WARNING: the organization name should be the same as in the ca certificate. why the warning? i followed the tuto and there they are not the same and still tls works. -- juha

2 1

Kamailio v3.1.0 Released
by Daniel-Constantin Mierla 07 Oct '10

07 Oct '10

Kamailio (OpenSER) v3.1.0 is out – major release with impressing number of new features and improvements. This release is a result of more than 8 months of development and testing from the teams of Kamailio (OpenSER) and SIP Express Router (SER) projects. Backed up by a solid development group, we are proud to announce that this release brings a large set of features, many for first time on the SIP server market, such as asynchronous TLS, UDP raw sockets, embedded HTTP and XCAP servers, embedded Lua, configuration file debugger. All together, there are over 15 new modules and countless improvements to old components. Since last major release (version 3.0.0, which was out in January 10, 2010), the two SIP servers, Kamailio and SER, are practically the same application, the name making the difference regarding the database structure and the extensions used for certain features, such as user database based authentication or location service. Therefore another development direction was towards smooth integration of Kamailio and SER extensions, previously duplicated modules such as auth, sl, ratelimit or sms were merged during this development cycle. Continue reading the release notes at: http://www.kamailio.org/w/kamailio-openser-v3.1.0-release-notes/ Many thanks to all developers and community members that made possible this release. -- Daniel-Constantin Mierla http://www.asipto.com

4 12

← Newer
1
...
17
18
19
20
21
22
23
...
34
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 2010