June 2017 - sr-dev - kamailio.org

[tracker] Assignee added: Assignment operators don't work
by sip-router 12 Jun '25

12 Jun '25

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#100 - Assignment operators don't work User who did this - Alex Hermann (axlh) http://sip-router.org/tracker/index.php?do=details&task_id=100 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.

2 1

[kamailio/kamailio] cfgt: doesn't support tm_suspend() tm_continue() (#684)
by Victor Seva 23 Jan '24

23 Jan '24

Actual implementation doesn't work with async. Need to investigate how to support it --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/684

3 8

[kamailio/kamailio] allow more than one tcp/tls connection to same destination (#1107)
by juha-h 23 Nov '23

23 Nov '23

When K connects to another SIP proxy over TCP or TLS, the connection is shared for all requests to that destination. If the receiving SIP proxy is K, it means that only one worker process is handling all those requests. This may become a bottleneck if processing of requests is time consuming, e.g., because of DB operations. It should therefore be possible one way or another to establish more than one parallel TCP or TLS connections to the same destination. One solution could be based on a function call, such as t_forward_connect(number), to be called before t_relay specifying the desired number of parallel connections shared randomly by outgoing requests. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1107

6 6

[kamailio/kamailio] kazoo: incomplete documentation (#976)
by Ovidiu Sas 23 Nov '23

23 Nov '23

There are lots of module parameters that are not documented in the README file: "amqp_timmer_process_interval" "amqp_consumer_ack_timeout_micro" "amqp_consumer_ack_timeout_sec" "amqp_interprocess_timeout_micro" "amqp_interprocess_timeout_sec" "amqp_waitframe_timeout_micro" "amqp_waitframe_timeout_sec" "amqp_consumer_workers" "amqp_query_timeout_micro" "amqp_query_timeout_sec" "pua_include_entity" "json_escape_char" "app_name" "use_federated_exchange" "federated_exchange" "amqp_heartbeats" "amqp_primary_zone" "amqp_command_hashtable_size" "amqp_result_avp" "amqps_ca_cert" "amqps_cert" "amqps_key" "amqps_verify_peer" "amqps_verify_hostname" Also, the follwing functions are not documented: "kazoo_json_keys" "kazoo_async_query" -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/976

3 3

[kamailio/kamailio] Presentity tabla, faster update when drop TCP/TLS connection (#915)
by jresende 23 Nov '23

23 Nov '23

Hello, I'm testing kamailio with a SIP client with presence support, when I get a connection drop from a client (i.e when the client lost the access to the Internet connection) I do not receive the change in the status to offline immediately, I just received when the timeout from the presentity database finishes. I know that I'm able to change the expiry parameter from the presentity table, but that increases my battery consumption and the data exchange, the same happens if I reduce the publish interval on the client side. The connection with the server are connected with the TLS or TCP. @miconda Suggested that a solution could be: "For TCP/TLS, what can work, it's to use tcpops module which can execute an event route when a tcp/tls connection is dropped. If you track the association of connection id with the call-id of the presence publish, then you may be able to do some tricks and lower the expires of the published presence state. I haven't had the time to see what's possible there, but could worth investing. An alternative would be to enhance presence module to behave as registrar/usrloc (which can delete contact records on connection drop) to expire documents when tcp/tls connection is closed (not sure if anyone already added it)." -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/915

2 2

[kamailio/kamailio] support valgrind when *_MALLOC is used (#949)
by Victor Seva 23 Nov '23

23 Nov '23

As explain at https://www.kamailio.org/wiki/tutorials/troubleshooting/memory#pkg_with_sys… valgrind can be used to check memory leaks if kamailio is compiled without ``*_MALLOC``. I would like to support valgrind even if kamailio is compiled to use its own memory managers. In order to archive this, valgrind has to be informed of how those managers control the memory as described at http://valgrind.org/docs/manual/mc-manual.html#mc-manual.mempools -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/949

4 6

[kamailio/kamailio] dnssec: stop using libdnsval-dev for DNSSEC validation (#851)
by Victor Seva 23 Nov '23

23 Nov '23

From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=843477 > From: Ondřej Surý <ondrej(a)debian.org> > To: Debian Bug Tracking System <submit(a)bugs.debian.org> > Subject: src:kamailio: stop using libval-dev for DNSSEC validation > > Package: src:kamailio > Version: 4.4.3-2 > Severity: serious > > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA512 > > Dear maintainer, > > please stop using libdnsval-dev for DNSSEC validation. src:dnsval > is very poorly upstream maintained (SVN repository, issue tracker, > mailing list are non-functional) and I am going to schedule it for > removal for stretch. > > In a long term you should migrated to better and maintained library > (preferrably getdns or just libunbound), but now please just drop > it. > > Cheers, > Ondrej > > - -- System Information: > Debian Release: 8.6 > APT prefers stable-updates > APT policy: (500, 'stable-updates'), (500, 'proposed-updates'), (500, 'stable') > Architecture: amd64 (x86_64) > > Kernel: Linux 4.2.0-41-generic (SMP w/24 CPU cores) > Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (charmap=UTF-8) > Shell: /bin/sh linked to /bin/dash > Init: systemd (via /run/systemd/system) > > -----BEGIN PGP SIGNATURE----- So I'm going to remove **dnssec** module from the official Debian package -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/851

2 2

[kamailio/kamailio] track_cseq_updates does not update Rack SIP header in PRACK. (#801)
by scfcplummy 23 Nov '23

23 Nov '23

Hi, When using dialog module and track_cseq_updates when needing to update CSeq for authenticated invites, if early media is present the CSeq in the Rack header is not also incremented. Kamailio version: version: kamailio 4.4.2 (x86_64/linux) 892ad6 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 892ad6 compiled on 11:18:36 Sep 28 2016 with gcc 5.4.0 -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/801

4 6

[kamailio/kamailio] sca: implement db_mode only (#781)
by Victor Seva 23 Nov '23

23 Nov '23

Sipwise hat ON: We have more than one server and we need to keep things in db in order to share sca subscription/appearance between servers -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/781

4 6

[kamailio/kamailio] dialplan: implement Iterative dialplan matching (#764)
by Victor Seva 13 Nov '23

13 Nov '23

>From http://lists.kamailio.org/pipermail/sr-dev/2016-August/036231.html On 24/08/16 10:17, Andreas Granig wrote: > Hi, > > When translating strings with the dialplan module, you sometimes end up > with very complex patterns for sanitizing the target string and > performing some replacements, since for a given dialplan id, processing > stops on the first match within the dialplan entries for a given dpid. > > The idea is to introduce a "continue" flag (default 0) in the dialplan > table indicating to proceed with processing further dialplan entries > within the given dpid after a match. The use case is to have a sanitize > rule with highest priority which e.g. removes any spaces, dashes and > parentheses from the target string, then with a lower priority do > further processing with the cleaned up string, e.g. stripping leading > double-zeroes or a plus when normalizing to E164 numbers, or replacing a > single leading zero with the country code and so on. > > This is particularly useful when a user dials a number from an address > book of some sort (e.g. on a mobile app) where number formats are stored > with country-specific formating characters like "+1-(234)-567 890", and > catching all of that in one rule results in really messy match/replace > patterns. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/764

4 5

[kamailio/kamailio] tm:local-request not documented (#980)
by Olle E. Johansson 18 Oct '23

18 Oct '23

The local-request event route is not documented. When using our friend google I find an old blog post by @miconda but not much else. I can come up with some good text, but need to know what can be done in the route, like - modify request uri - add/remove headers - drop request - add/modify destination uri ($du) -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/980

3 8

[kamailio/kamailio] keep new features in a file in the repository (#668)
by Victor Seva 26 Aug '22

26 Aug '22

This will allow us to point https://www.kamailio.org/wiki/features/new-in-devel to the file and "force" developers to update that file with the new features when they are introduced in the repository Remaining developers to upgrade the wiki seems pointless and anyone can create a PR for changes --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/668

4 4

[kamailio/kamailio] Diameter AVP handling from kamailio.cfg (#922)
by miricz 11 Jan '22

11 Jan '22

Below feature were discussed with Carsten Bock Currently Diameter AVP values and especially Experimental Result Code is not available from the kamailio.cfg Therefore I would like to request such kind of feature. I would like to use it mainly on Cx interface for Server-Assignment-Answer (SAA), Location-Info-Answer (LIA), Multimedia-Auth-Answer (MAA), Push-Profile-Answer (PPA) It should be implemented such a way like in the ims_charging module. Thank you very much in advance! _Cheers, Zoltan_ -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/922

2 2

[kamailio] add socket activation support (#293)
by zabbal 11 Jan '22

11 Jan '22

Having (optional) support for socket activation in Kamailio would bring several benefits: * Security: systemd can listen on privileged ports or socket paths and start Kamailio with privileges already dropped. * Major upgrades or reconfigurations of Kamailio requiring a full restart are possible without having the listening socket(s) ever go away. * Any service dependent on Kamailio doesn't have to wait for it to finish starting (or start at all). --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/293

3 4

[kamailio/kamailio] pv needed to get access to X509v3 Subject Alternative Names of peer's SSL certificate (#707)
by juha-h 11 Jan '22

11 Jan '22

A sip proxy may serve many domains listed in its SSL certificate X509v3 Subject Alternative Name field. In order to find out if a peer sip proxy is serving a particular domain, access would be needed in config file to this list of domains. --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/707

4 4

[kamailio/kamailio] Expand the list of required default 3rd party libraries for Kamailio (#969)
by Olle E. Johansson 02 Dec '20

02 Dec '20

(from devmeeting #Fosdem) - adding new dependencies as core dependencies - Curl - libssl - uuid - libunistring - libxml2 Any other candidates? They have to be libraries that are commonly installed on most Linux/Unix system. This would mean that a lot of more modules will be built by default, like TLS, HTTP_CLIENT, WEBSOCKET. We may also look over the names of the packages/groups for the build system and linux distros -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/969

2 3

[kamailio] Anyone thinking about adding JWT (JSON Web Token) support to Kamailio (#29)
by mading087 24 Jul '20

24 Jul '20

It seems a good idea to support JWT as a new SIP authorization method. Wonder if anyone is interested? Think auth_db would be the best spot to add support for JWT. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/29

12 24

[kamailio/kamailio] cfgt: RPC command to reset/clean test scenario (#574)
by Victor Seva 05 Dec '19

05 Dec '19

allow to clean the shared and private info of a test scenario in order to be able to re-trigger it without restart kamailio --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/574

1 1

[kamailio/kamailio] cancel the branches instantly instead of on provisional replies (#909)
by aqsyounas 25 Nov '19

25 Nov '19

I am forking a call to multiple destinations and want to keep the only branch which sends quicker provisional 180/183 reply and cancel the remaining branches. Below is my related cfg snippet. modparam("tm", "failure_reply_mode", 3) modparam("tm", "fr_timer", 30000) modparam("tm", "fr_inv_timer", 120000) modparam("tm", "cancel_b_method", 2) ... route[SIPOUT] { if (uri==myself) return; append_hf("P-hint: outbound\r\n"); append_branch(); append_branch(); route(RELAY); exit; } onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); if(status=~"[12][0-9][0-9]") { xlog("L_INFO","Received $rs (IP:$si:$sp)\n"); if(status=~"18[03]"){ t_cancel_branches("others"); xlog("L_INFO","cancelled all other branches\n"); } route(NATMANAGE); } } ... But I see kamailio does not instantly send CANCEL to other branches after it has received 180/180 from any branch. Kamailio is sending CANCEL to other branches after they start sending 180/183 one by one. I want to cancel other brances instantly as soon as i get reply from any other branch. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/909

3 4

[kamailio/kamailio] Unexpected log_systemd behavior when daemon is forked (#799)
by Anthony Messina 22 Nov '19

22 Nov '19

Starting Kamailio (4.4 with branch updates through e43d82d applied) with the following systemd unit file, native systemd/journald logging doesn't work as expected. I *do* get core logging when I use ``` log_engine_type="systemd" loadmodule "log_systemd.so" ``` but `xlog` and `sd_journal_print` *don't* send anything to the journal. When I comment out `log_engine_type`, keeping the log_systemd.so module loaded, `sd_journal_print` *does* log the messages properly to the systemd journal, `xlog` and core startup messages are sent to syslog. If I change the service to `Type=simple` and add the `-D` option to `ExecStart` to disable forking, then logging to systemd via `xlog` and `sd_journal_print` works, but TCP/TLS listeners aren't created. ``` [Unit] Description=Kamailio SIP Server Documentation=man:kamailio(8) http://www.kamailio.org/ After=syslog.target network-online.target Wants=network-online.target [Service] Type=forking User=kamailio Environment=SHM_SIZE=64 Environment=PKG_SIZE=8 ExecStartPre=/usr/sbin/kamailio -c ExecStart=/usr/sbin/kamailio -m $SHM_SIZE -M $PKG_SIZE -P /run/kamailio/kamailio.pid PIDFile=/run/kamailio/kamailio.pid Restart=on-failure RestartSec=30 RuntimeDirectory=kamailio RuntimeDirectoryMode=0750 [Install] WantedBy=multi-user.target ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/799

3 16

[kamailio/kamailio] Incorrect translation of tel: uri to sip: uri in tel2sip() (#1173)
by Donald Carr 15 Nov '19

15 Nov '19

### Description  I received a wireshark trace from a team member showing that a tel: uri was translated to a sip: uri in a very strange (invalid) way: INVITE tel:491234567891;phone-context=ims.mnc001.mcc001.3gppnetwork.org Was translated to: INVITE sip:491234567891;phone-context=ims.mnc001.mcc001.3gppnetwork.org@ims.mnc001.mcc001.3gppnetwork.org;user=phone ### Troubleshooting I first thought this was definitely an error, and only the phone number should be copied to the sip: uri. But, on further reading of the specification, (https://www.ietf.org/rfc/rfc3261.txt), I see that it is in fact legal to leave all parameters in. Though, when the phone-context parameter is simply a domain, it would at least seem the cleanest thing would be to remove it when the exact same domain is also inserted after the @ in the sip message. So, looking to find where the message is translated, I saw in the scscf.cfg configuration file that there is a translation specified. I found that "tel2sip" is mapped to the C function of the same name tel2sip() In this function, the translation will do exactly what I found in the trace, in other words, it will leave in all parameters separated by semi-colon, inserted before the @ symbol. But, reading the spec, I see that the spec is not being followed in any case. The spec states that all parameters included when translating, must be switched to alphabetic order, with the exception that isdn-subaddress and post-dial, must occur first and in that order. There is no code in tel2sip() to perform that sorting. Also, the parser removes '(', ')', '.', and '-' in the phone number, as specified, but, these same characters could be scattered anywhere in invalid places, and they are just silently removed, '+' can scattered anywhere and it is just left alone, Other characters can be scattered anywhere and they will just be left as-is, no error. So, I feel there should be some minimal checking of the phone number, trying to follow the spec (if we could just execute the BNF from the spec!). #### Reproduction  This can be reproduced by sending a tel: uri with parameters inserted separated by semicolon. #### Debugging Data  ``` (none) ``` #### Log Messages  ``` (none) ``` #### SIP Traffic  ``` See attached file ``` ### Possible Solutions  The solution would be to modify tel2sip(), adding the sorting of parameters, putting the two exceptions first if they exist, before inserting back into the string. We should also throw errors on obvious bad formatting and ilegal characters, etc, in the input tel: uri Should we remove the "phone-context" if it is a domain and also exactly the same as the domain inserted after the @? ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.0-dev5 (x86_64/linux) da4ef4-dirty flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: da4ef4 -dirty compiled on 10:37:40 May 12 2017 with gcc 5.4.0 ``` SIP spec: https://www.ietf.org/rfc/rfc3261.txtWireshark output: ![wireshark-tel2sip](https://user-images.githubusercontent.com/4886876/27705203-cfd3c150-5cd2-11e7-9f77-1664a51e7ac3.png) ``` In RFC 3966, Tel URI format: The "tel" URI has the following syntax: telephone-uri = "tel:" telephone-subscriber telephone-subscriber = global-number / local-number global-number = global-number-digits *par local-number = local-number-digits *par context *par par = parameter / extension / isdn-subaddress isdn-subaddress = ";isub=" 1*uric extension = ";ext=" 1*phonedigit context = ";phone-context=" descriptor descriptor = domainname / global-number-digits global-number-digits = "+" *phonedigit DIGIT *phonedigit local-number-digits = *phonedigit-hex (HEXDIG / "*" / "#")*phonedigit-hex domainname = *( domainlabel "." ) toplabel [ "." ] domainlabel = alphanum / alphanum *( alphanum / "-" ) alphanum toplabel = ALPHA / ALPHA *( alphanum / "-" ) alphanum parameter = ";" pname ["=" pvalue ] pname = 1*( alphanum / "-" ) pvalue = 1*paramchar paramchar = param-unreserved / unreserved / pct-encoded unreserved = alphanum / mark mark = "-" / "_" / "." / "!" / "~" / "*" / "'" / "(" / ")" pct-encoded = "%" HEXDIG HEXDIG param-unreserved = "[" / "]" / "/" / ":" / "&" / "+" / "$" phonedigit = DIGIT / [ visual-separator ] phonedigit-hex = HEXDIG / "*" / "#" / [ visual-separator ] visual-separator = "-" / "." / "(" / ")" alphanum = ALPHA / DIGIT reserved = ";" / "/" / "?" / ":" / "@" / "&" / "=" / "+" / "$" / "," uric = reserved / unreserved / pct-encoded ``` * **Operating System**:  ``` # uname -a Linux epc-enablers 4.4.0-51-generic #72-Ubuntu SMP Thu Nov 24 18:29:54 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1173

6 26

[kamailio] avpops: avp_copy add xavp (#7)
by Victor Seva 07 Oct '19

07 Oct '19

We have avp_copy on avpops module but we don’t have anything to copy xavps. ``` // copy all the content of an avp to a xavp $xavp(a[0]=>b) = $(avp(x)[*]); // deleting left content $xavp(a[0]=>b[*]) = $(avp(x)[*]); // copy xavp to a xavp with index $xavp(a[0]) = $xavp(b[1]); // all $xavp(a[*]) = $xavp(b[*]); // copy all content of a xavp to a avp $avp(x) = $xavp(a[0]=>b[*]); ``` --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/7

4 8

[kamailio/kamailio] $T_reply_last returns current reply status instead of previous (#735)
by Alex Hermann 07 Oct '19

07 Oct '19

The PV _$T_reply_last_ is supposed to return the _previous_ reply status. Since commit b7c588dff06 to fix #315 this PV returns the _current_ reply status. --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/735

2 4

[kamailio/kamailio] to tags generation (#1164)
by Dmitri Savolainen 02 Sep '19

02 Sep '19

### Description Not shure is this relevant issue. according to rfc3261: > When a tag is generated by a UA for insertion into a request or > response, it MUST be globally unique and cryptographically random > with at least 32 bits of randomness. Kamailio has 16 instead and distribution is not good. I look at tags for 419485 sip flows (different callid) and table below (top keys ordered by count): tag suffix; count for different flows with this suffix ed54 6258 d118 5988 56ce 5923 a7a5 5220 de51 2150 82d8 1143 cf52 890 af92 740 7b5f 534 85f7 307 e553 163 7f7e 138 1d55 130 1afe 62 5a69 43 7caa 18 8474 18 9db2 18 11d3 18 f9ff 18 5420 17 dae6 17 908d 17 ede4 17 09ee 17 96be 17 25dc 17 af6d 16 2506 16 3da0 16 f161 16 1c29 16 #### SIP Traffic To: <sip:039*101@host:5071>;tag=555d2c3eafafcba8ac92b676e91bb6ed.58eb -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1164

3 4

[kamailio/kamailio] token parser (#648)
by Dmitri Savolainen 07 Jun '19

07 Jun '19

i try script: ``` $var(some_string) = 'a=foo1;b=foo2;c=foo3,4,5;d=3'; $var(c_value) = $(var(some_string){param.value,c,;}); xlog("L_INFO", "'c' param from '$var(some_string)' is '$var(c_value)'"); ``` in log: > 'c' param from 'a=foo1;b=foo2;c=foo3,4,5;d=3' is 'foo3' Has this behaviour any reason? or it's possible to delete comma from stop list (and use separator parameter for comma-delimited list)? ``` diff --git a/parser/parse_param.c b/parser/parse_param.c index b9e0fbc..e7784c8 100644 --- a/parser/parse_param.c +++ b/parser/parse_param.c @@ -355,7 +355,6 @@ static inline int parse_token_param(str* _s, str* _r, char separator) case '\t': case '\r': case '\n': - case ',': /* So if you find * any of them * stop iterating ``` --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/648

2 5

$fU pv Assign New Value Isnt Rewrite old value
by Cléviton Mendes de Araújo 29 May '19

29 May '19

Hi,Kamailio Community Is there a bug when we assign new value to $fU pseudo-variable multi time? My scenery is according below: In a point on config file, let us that $fU value is: 7777. When I do assign: ..... $fU = "5555" + $fU; ### Here $fU = 55557777 ..... In another point, let us that value $sht(htble=>$var(nnnn)) hold is: 44444444. And I do: ..... $fU = $sht(htble=>$var(nnnn)); #### Here, it seems that this is happening $fU = 5555777744444444 ..... When I turn on ngrep analysis, I catch From header: ................. ................. From: "User Name" <sip:5555777744444444@IP-Address> ................. ................. This two assignments are realizing on same route block. So, it seems to be a bug. Best Regards, CMA

3 5

[kamailio] dialog: run event_route[dialog:end] in case of dialog termination by … (#246)
by Andrey Utkin 29 May '19

29 May '19

…interface commands You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/246 -- Commit Summary -- * dialog: run event_route[dialog:end] in case of dialog termination by interface commands -- File Changes -- M modules/dialog/dlg_req_within.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/246.patch https://github.com/kamailio/kamailio/pull/246.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/246

3 7

[kamailio/kamailio] cfgt: wrong flow if route has no last action return (#569)
by Victor Seva 25 Apr '19

25 Apr '19

The actual implementation is based on the cfg actions, so when there is no 'return' action defined the route flow detected is wrong. --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/569

3 4

[kamailio/kamailio] Statistics: Average duration of DNS requests (#821)
by ng-voice GmbH 11 Mar '19

11 Mar '19

Hi, we do a lot of DNS requests (ENUM, Domain-Lookups, etc.). It would be quite awesome, if Kamailio would produce a statistic on the average duration of a DNS-Query. Thanks, Carsten P.S.: It would also be nice, to have similar stats on MySQL-DB-Queries. One day, if I find time.... -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/821

4 4

[kamailio] dialog module with broken defaults (#372)
by zabbal 23 Feb '19

23 Feb '19

If I enable dialog module Kamailio will fail to start with following error: ERROR: dialog [dialog.c:498]: mod_init(): no dlg flag set!! In the documentation this parameter is set to 4 as an example: modparam("dialog", "dlg_flag", 4) But no comments made as to why number 4 is used, which numbers are possible to use and most importantly - why such default value is chosen? In any case - module should use default which does not break server's configuration. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/372

7 9

[kamailio/kamailio] tls: detection of kerberos support for openssl at runtime (#1050)
by Victor Seva 27 Dec '18

27 Dec '18

It was reported https://github.com/kamailio/kamailio/issues/662#issuecomment-261920382 but I think is not related to that issue, so opening another one. >From https://buildd.debian.org/status/fetch.php?pkg=openssl&arch=amd64&ver=1.1.0… ``` Configuring OpenSSL version 1.1.0e (0x1010005fL) no-asan [default] OPENSSL_NO_ASAN no-crypto-mdebug [default] OPENSSL_NO_CRYPTO_MDEBUG no-crypto-mdebug-backtrace [default] OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE no-dynamic-engine [forced] no-egd [default] OPENSSL_NO_EGD no-fuzz-afl [default] OPENSSL_NO_FUZZ_AFL no-fuzz-libfuzzer [default] OPENSSL_NO_FUZZ_LIBFUZZER no-heartbeats [default] OPENSSL_NO_HEARTBEATS no-idea [option] OPENSSL_NO_IDEA (skip dir) no-md2 [default] OPENSSL_NO_MD2 (skip dir) no-mdc2 [option] OPENSSL_NO_MDC2 (skip dir) no-msan [default] OPENSSL_NO_MSAN no-rc5 [option] OPENSSL_NO_RC5 (skip dir) no-sctp [default] OPENSSL_NO_SCTP no-shared [option] no-ssl-trace [default] OPENSSL_NO_SSL_TRACE no-ssl3 [option(ssl3-method)] OPENSSL_NO_SSL3 no-ssl3-method [option] OPENSSL_NO_SSL3_METHOD no-ubsan [default] OPENSSL_NO_UBSAN no-weak-ssl-ciphers [default] OPENSSL_NO_WEAK_SSL_CIPHERS no-zlib [option] no-zlib-dynamic [default] Configuring for debian-amd64 ``` so openssl 1.1.0e has kerberos support but trying to start kamailio 4.4.4-2 (from Debian stretch) with TLS enabled ``` Mar 31 09:05:14 router /usr/sbin/kamailio[4375]: INFO: tls [tls_mod.c:368]: mod_init(): With Diffie Hellman Mar 31 09:05:14 router /usr/sbin/kamailio[4375]: INFO: tls [tls_init.c:633]: init_tls_h(): tls: _init_tls_h: compiled with openssl version "OpenSSL 1.1.0d 26 Jan 2017" (0x10100 04f), kerberos support: on, compression: on Mar 31 09:05:14 router /usr/sbin/kamailio[4375]: INFO: tls [tls_init.c:641]: init_tls_h(): tls: init_tls_h: installed openssl library version "OpenSSL 1.1.0e 16 Feb 2017" (0x101000 5f), kerberos support: off, zlib compression: off compiler: gcc -DDSO_DLFCN -DHAVE_DLFCN_H -DNDEBUG -DOPENSSL_THREADS -DOPENSSL_NO_STATIC_ENGINE -DOPENSSL_PIC -DOPENSSL_IA32_SSE2 -D OPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DRC4_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DGHASH_ASM -DECP_NISTZ25 6_ASM -DPADLOCK_ASM -DPOLY1305_ASM -DOPENSSLDIR="\"/usr/lib/ssl\"" -DENGINESDIR="\"/usr/lib/x86_64-linux-gnu/engines-1.1\"" Mar 31 09:05:14 router /usr/sbin/kamailio[4375]: : tls [tls_init.c:651]: init_tls_h(): ERROR: tls: init_tls_h: openssl compile options mismatch: library has kerberos support disabled and Kamailio tls enabled (unstable configuration) (tls_force_run in kamailio.cfg will override this check) Mar 31 09:05:14 router /usr/sbin/kamailio[4375]: CRITICAL: <core> [main.c:2592]: main(): could not initialize tls, exiting... ``` A rebuild version with the same openssl version doesn't help ``` Mar 31 11:20:41 spce lb[17194]: INFO: tls [tls_init.c:633]: init_tls_h(): tls: _init_tls_h: compiled with openssl version "OpenSSL 1.1.0e 16 Feb 2017" (0x1010005f), kerberos support: on, compression: on Mar 31 11:20:41 spce lb[17194]: INFO: tls [tls_init.c:641]: init_tls_h(): tls: init_tls_h: installed openssl library version "OpenSSL 1.1.0e 16 Feb 2017" (0x1010005f), kerberos support: off, zlib compression: off#012 compiler: gcc -DDSO_DLFCN -DHAVE_DLFCN_H -DNDEBUG -DOPENSSL_THREADS -DOPENSSL_NO_STATIC_ENGINE -DOPENSSL_PIC -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DRC4_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DGHASH_ASM -DECP_NISTZ256_ASM -DPADLOCK_ASM -DPOLY1305_ASM -DOPENSSLDIR="\"/usr/lib/ssl\"" -DENGINESDIR="\"/usr/lib/x86_64-linux-gnu/engines-1.1\"" Mar 31 11:20:41 spce lb[17194]: : tls [tls_init.c:651]: init_tls_h(): ERROR: tls: init_tls_h: openssl compile options mismatch: library has kerberos support disabled and Kamailio tls enabled (unstable configuration)#012 (tls_force_run in kamailio.cfg will override this check) Mar 31 11:20:41 spce lb[17194]: CRITICAL: <core> [main.c:2592]: main(): could not initialize tls, exiting... ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1050

2 11

[kamailio/kamailio] Segfault when calling $sel(cfg_get...) (#1159)
by Sebastian Damm 20 Dec '18

20 Dec '18

### Description I set some configuration parameters in the global section of kamailio.cfg and wanted to read them later in request_route and reply_route. But when accessing them, Kamailio segfaults. However, I can read them via kamcmd after startup. ### Troubleshooting #### Reproduction Set the following config parameter in your kamailio.cfg in the global section: ``` config.foo = "hello Daniel" ``` later, put your request and reply route in the configuration file: ``` request_route { xlog("L_INFO", "Reading config.foo into variable"); $var(configfoo) = $sel(cfg_get.config.foo); } onreply_route { xlog("L_INFO", "Reading config.foo into variable"); $var(configfoo) = $sel(cfg_get.config.foo); } ``` #### Debugging Data gdb output is the following: ``` GNU gdb (Debian 7.7.1+dfsg-5) 7.7.1 Copyright (C) 2014 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from /usr/sbin/kamailio...Reading symbols from /usr/lib/debug/.build-id/94/dfffd4a243602bbd4d977202f533c3e9e613f7.debug...done. done. [New LWP 7999] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio_li_sniffer.pid -f /etc/kamaili'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f19e418e20d in ?? () from /lib/x86_64-linux-gnu/libc.so.6 #0 0x00007f19e418e20d in ?? () from /lib/x86_64-linux-gnu/libc.so.6 No symbol table info available. #1 0x00000000006f4813 in select_cfg_var (res=0x7ffc998181d0, s=0x7f19e3965f60, msg=0x7f19e3985dd0) at core/cfg/cfg_select.c:227 group = 0x7f19e394e600 var = 0x7f19e3985958 p = 0x40 i = 32537 buf = '\000' <repeats 21 times> __FUNCTION__ = "select_cfg_var" #2 0x000000000050a6f0 in run_select (res=0x7ffc998181d0, s=0x7f19e3965f60, msg=0x7f19e3985dd0) at core/select.c:425 ret = 0 orig_level = 0 __FUNCTION__ = "run_select" #3 0x00007f19e133f089 in pv_get_select (msg=0x7f19e3985dd0, param=0x7f19e39667b8, res=0x7ffc998182d0) at pv_select.c:61 s = {s = 0x0, len = 0} sel = 0x7f19e3965f60 #4 0x00000000005b38a3 in pv_get_spec_value (msg=0x7f19e3985dd0, sp=0x7f19e39667a0, value=0x7ffc998182d0) at core/pvapi.c:1307 ret = 0 __FUNCTION__ = "pv_get_spec_value" #5 0x000000000057b007 in lval_pvar_assign (h=0x7ffc99818a80, msg=0x7f19e3985dd0, lv=0x7f19e3966690, rv=0x7f19e3966798) at core/lvalue.c:335 pvar = 0x7f19e39658d8 pval = {rs = {s = 0x0, len = 0}, ri = 0, flags = 0} r_avp = 0x417590 <syslog@plt> avp_val = {n = 7876360, s = {s = 0x782f08 "DEBUG", len = 7}, re = 0x782f08} ret = 0 v = 18987664 destroy_pval = 0 __FUNCTION__ = "lval_pvar_assign" #6 0x000000000057bd36 in lval_assign (h=0x7ffc99818a80, msg=0x7f19e3985dd0, lv=0x7f19e3966690, rve=0x7f19e3966790) at core/lvalue.c:400 rv = 0x7f19e3966798 ret = 0 __FUNCTION__ = "lval_assign" #7 0x0000000000467f60 in do_action (h=0x7ffc99818a80, a=0x7f19e3966ec0, msg=0x7f19e3985dd0) at core/action.c:1430 ret = -5 v = 6 dst = {send_sock = 0x7f19e449f300, to = {s = {sa_family = 34783, sa_data = "\201\231\374\177\000\000\220\025\031\001\000\000\000"}, sin = { sin_family = 34783, sin_port = 39297, sin_addr = {s_addr = 32764}, sin_zero = "\220\025\031\001\000\000\000"}, sin6 = {sin6_family = 34783, sin6_port = 39297, sin6_flowinfo = 32764, sin6_addr = {__in6_u = { __u6_addr8 = "\220\025\031\001\000\000\000\000@\206\201\231\374\177\000", __u6_addr16 = {5520, 281, 0, 0, 34368, 39297, 32764, 0}, __u6_addr32 = {18421136, 0, 2575402560, 32764}}}, sin6_scope_id = 8172960}}, id = 0, proto = -32 '\340', send_flags = {f = 188 '\274', blst_imask = 33 '!'}} tmp = 0x7ffc99818a90 "\220uA" new_uri = 0x2010 <error: Cannot access memory at address 0x2010> end = 0x7f19e44a1620 "" crt = 0x3939393700000015 <error: Cannot access memory at address 0x3939393700000015> cmd = 0x7f19e395d060 len = -467267128 user = 32537 uri = {user = {s = 0x7f19e44a1620 "", len = 18988272}, passwd = {s = 0x121bce0 "`\002", len = -467267135}, host = { s = 0x121bcfc "10:34:39 /usr/sbin/kamailio[7999]: DEBUG: <core> [core/select.c:412]: run_select(): Calling SELECT 0x7f19e3965f60\n", len = -464913696}, port = { s = 0x8 <error: Cannot access memory at address 0x8>, len = -467275366}, params = { s = 0x1 <error: Cannot access memory at address 0x1>, len = -468002654}, sip_params = { s = 0x3939393700000008 <error: Cannot access memory at address 0x3939393700000008>, len = 8187}, headers = {s = 0x0, len = 18987664}, port_no = 5336, proto = 125, type = ERROR_URI_T, flags = (unknown: 18988256), transport = { s = 0x2010 <error: Cannot access memory at address 0x2010>, len = -464906720}, ttl = { s = 0x121dcf0 "", len = -460542388}, user_param = { s = 0x2010 <error: Cannot access memory at address 0x2010>, len = -1472036457}, maddr = { s = 0x3 <error: Cannot access memory at address 0x3>, len = 5}, method = { s = 0x7f19e4ad7578 "\260A\256\344\031\177", len = -460539970}, lr = {s = 0x121bce0 "`\002", len = -1719564448}, r2 = {s = 0x7f19e40ffd28 "", len = -468690656}, gr = { s = 0x7ffc99818870 " Y\020\344\031\177", len = 44108294}, transport_val = { s = 0x7ffc99818860 "\377\377\377\377", len = 8180}, ttl_val = {s = 0x0, len = -458394160}, user_param_val = {s = 0x7f19e4ad7000 "", len = 4253282}, maddr_val = {s = 0x7f19e410cd78 "", len = 4209664}, method_val = { s = 0x500000000 <error: Cannot access memory at address 0x500000000>, len = 981}, lr_val = { s = 0x7f19e449f300 "\033\t&\344\031\177", len = -458394160}, r2_val = { s = 0x7ffc99818900 "@\212\201\231\374\177", len = -458341112}, gr_val = { s = 0x7ffc99818928 " Y\020\344\031\177", len = -458341968}} next_hop = {user = {s = 0x1 <error: Cannot access memory at address 0x1>, len = -460539539}, passwd = {s = 0x0, len = -458394160}, host = { s = 0x393300000005 <error: Cannot access memory at address 0x393300000005>, len = 0}, port = {s = 0x1 <error: Cannot access memory at address 0x1>, len = -458341968}, params = { s = 0x121bcf0 "<191>Jun 21 10:34:39 /usr/sbin/kamailio[7999]: DEBUG: <core> [core/select.c:412]: run_select(): Calling SELECT 0x7f19e3965f60\n", len = 0}, sip_params = { s = 0x121bcf0 "<191>Jun 21 10:34:39 /usr/sbin/kamailio[7999]: DEBUG: <core> [core/select.c:412]: run_select(): Calling SELECT 0x7f19e3965f60\n", len = -467267135}, headers = {s = 0x0, len = -458341112}, port_no = 34928, proto = 39297, type = 32764, flags = (unknown: 2575403104), transport = { s = 0xa8428197 <error: Cannot access memory at address 0xa8428197>, len = 4253282}, ttl = { s = 0xffffffff <error: Cannot access memory at address 0xffffffff>, len = -467275366}, user_param = {s = 0x7f19e4105920 "\203I", len = -458395648}, maddr = { s = 0x3939393700781a68 <error: Cannot access memory at address 0x3939393700781a68>, len = 8187}, method = {s = 0x0, len = 18987664}, lr = { s = 0x781d20 "%s: %s%s(): preparing to run routing scripts...\n", len = 18988256}, r2 = { s = 0x2010 <error: Cannot access memory at address 0x2010>, len = -464906720}, gr = { s = 0x121dcf0 "", len = 135}, transport_val = { s = 0x2010 <error: Cannot access memory at address 0x2010>, len = 10658448}, ttl_val = { s = 0x0, len = 7}, user_param_val = { s = 0xa3557a <buf+506> "13296 REGISTER\r\nMax-Forwards: 69\r\nUser-Agent: snom820/8.7.5.17\r\nContact: <sip:1016908e0@82.116.119.72:53401;line=hqwwdi0u>;reg-id=1;q=1.0;audio;mobility=\"fixed\";duplex=\"full\";description=\"snomD765\";ac"..., len = 4289936}, maddr_val = { s = 0x7ffc99818a40 "`\213\201\231\374\177", len = -460521481}, method_val = { s = 0x5 <error: Cannot access memory at address 0x5>, len = 0}, lr_val = { s = 0x100000000 <error: Cannot access memory at address 0x100000000>, len = -468690656}, r2_val = {s = 0x417590 <syslog@plt> "\377%\022.a", len = -1719563712}, gr_val = { s = 0x782f08 "DEBUG", len = -460495595}} u = 0x3000000010 port = 39297 dst_host = 0x121bce0 i = 13 flags = 2 avp = 0x7ffc99818b70 st = {flags = 3830051584, id = 32537, name = {n = -1719564353, s = {s = 0x7ffc998187bf "", len = 18421136}, re = 0x7ffc998187bf}, avp = 0x7ffc99818620} sct = 0x7f19e41aeb51 sjt = 0x2010 rve = 0x7ce8d0 mct = 0x1ff4 rv = 0x7ffc99818b50 rv1 = 0x7ffc99818ab0 c1 = {cache_type = 8208, val_type = 14643, c = {avp_val = {n = -464906720, s = { s = 0x7f19e44a1620 "", len = 18996464}, re = 0x7f19e44a1620}, pval = {rs = { s = 0x7f19e44a1620 "", len = 18996464}, ri = 150, flags = 0}}, i2s = "\020 \000\000\063\071\000\000\254u\027\344\031\177\000\000\020\207\201\231\374\177"} s = {s = 0x6 <error: Cannot access memory at address 0x6>, len = -467997871} srevp = {0x7ffc99818830, 0x7ffc99818600} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = { number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = { s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = { number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #8 0x00000000004699fa in run_actions (h=0x7ffc99818a80, a=0x7f19e3965510, msg=0x7f19e3985dd0) at core/action.c:1552 t = 0x7f19e3966ec0 ret = 1 mod = 0xab00000003 ms = 0 __FUNCTION__ = "run_actions" #9 0x000000000046a1bd in run_top_route (a=0x7f19e3965510, msg=0x7f19e3985dd0, c=0x0) at core/action.c:1641 ctx = {rec_lev = 1, run_flags = 0, last_retcode = 1, jmp_env = {{__jmpbuf = {4289936, -8039283903424375778, 7876360, 7, 10704250, 4289936, -8039283903554399202, 8041047856258208798}, __mask_was_saved = 0, __saved_mask = {__val = {139749141390273, 4294967416, 20, 20, 18446744073709551615, 140722883889968, 139749141390764, 7876360, 0, 4611686022733059450, 139749169323472, 140722883890016, 5295428, 4302843656, 139749169323472, 4611686022733059450}}}}} p = 0x7ffc99818a80 ret = 0 sfbk = 0 #10 0x000000000057f2fc in receive_msg ( buf=0xa353f7 <buf+119> "REGISTER sip:sipgate.de SIP/2.0\r\nVia: SIP/2.0/UDP 217.116.120.247;branch=z9hG4bK0333.dae22993f9315bf8290cb153c6c2a81a.0\r\nVia: SIP/2.0/UDP 82.116.119.72:53401;received=82.116.119.72;branch=z9hG4bK-5hxr"..., len=1051, rcv_info=0x7ffc99818e80) at core/receive.c:264 msg = 0x7f19e3985dd0 ctx = {rec_lev = 248976, run_flags = 0, last_retcode = 568056, jmp_env = {{__jmpbuf = {568056, 8, 25, -8487096721362804224, 170079128784, 139749117125472, 139749169323120, 21482915456}, __mask_was_saved = 11, __saved_mask = {__val = {139749169100840, 7876360, 7, 140722883890512, 139749114876551, 139749114945152, 171331424705, 140722883890600, 98307693672, 11401280, 0, 8834747727873, 139745350909968, 7876360, 139749169100840, 7876360}}}}} bctx = 0x661d2b <qm_info+46> ret = 103 stats_on = 0 tvb = {tv_sec = 1498034079, tv_usec = 444700} tve = {tv_sec = 139749169323416, tv_usec = 139749168754704} tz = {tz_minuteswest = 0, tz_dsttime = 0} diff = 0 inb = { s = 0xa353f7 <buf+119> "REGISTER sip:sipgate.de SIP/2.0\r\nVia: SIP/2.0/UDP 217.116.120.247;branch=z9hG4bK0333.dae22993f9315bf8290cb153c6c2a81a.0\r\nVia: SIP/2.0/UDP 82.116.119.72:53401;received=82.116.119.72;branch=z9hG4bK-5hxr"..., len = 1051} netinfo = {data = {s = 0x7f19e3933440 "", len = 0}, dst = 0x800000 <yytable+6400>, rcv = 0x775508} keng = 0x0 __FUNCTION__ = "receive_msg" #11 0x00007f19e059ccdf in parsing_hepv3_message (buf=0xa35380 <buf> "HEP3\004\222", len=1170) at hep.c:499 from = {s = {sa_family = 2, sa_data = "\023\304\331tx\367\000\000\000\000\000\000\000"}, sin = { sin_family = 2, sin_port = 50195, sin_addr = {s_addr = 4151866585}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 50195, sin6_flowinfo = 4151866585, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}} to = {s = {sa_family = 2, sa_data = "\023\304\254\024\025\004\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 50195, sin_addr = {s_addr = 68490412}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 50195, sin6_flowinfo = 68490412, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}} ri = {src_ip = {af = 2, len = 4, u = {addrl = {139749502776537, 1}, addr32 = {4151866585, 32537, 1, 0}, addr16 = {29913, 63352, 32537, 0, 1, 0, 0, 0}, addr = "\331tx\367\031\177\000\000\001\000\000\000\000\000\000"}}, dst_ip = {af = 2, len = 4, u = {addrl = {68490412, 139749187483088}, addr32 = {68490412, 0, 3836573136, 32537}, addr16 = {5292, 1045, 0, 0, 30160, 58541, 32537, 0}, addr = "\254\024\025\004\000\000\000\000\320u\255\344\031\177\000"}}, src_port = 5060, dst_port = 5060, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = {sa_family = 2, sa_data = "\023\304\331tx\367\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 50195, sin_addr = {s_addr = 4151866585}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 50195, sin6_flowinfo = 4151866585, sin6_addr = {__in6_u = { __u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0x7f19e3985c50, proto = 1 '\001'} tmp = 0xa353f1 <buf+113> "" dst_ip = {af = 2, len = 4, u = {addrl = {68490412, 140722883890976}, addr32 = {68490412, 0, 2575404832, 32764}, addr16 = {5292, 1045, 0, 0, 36640, 39297, 32764, 0}, addr = "\254\024\025\004\000\000\000\000 \217\201\231\374\177\000"}} src_ip = {af = 2, len = 4, u = {addrl = {139749502776537, 139749187481600}, addr32 = { 4151866585, 32537, 3836571648, 32537}, addr16 = {29913, 63352, 32537, 0, 28672, 58541, 32537, 0}, addr = "\331tx\367\031\177\000\000\000p\255\344\031\177\000"}} si = 0x7f19e3985c50 tmp_len = 4 i = 1170 payload = 0xa353f7 <buf+119> "REGISTER sip:sipgate.de SIP/2.0\r\nVia: SIP/2.0/UDP 217.116.120.247;branch=z9hG4bK0333.dae22993f9315bf8290cb153c6c2a81a.0\r\nVia: SIP/2.0/UDP 82.116.119.72:53401;received=82.116.119.72;branch=z9hG4bK-5hxr"... payload_len = 1051 chunk = 0xa353f1 <buf+113> hg = 0x7f19e3985b60 totelem = 11 chunk_vendor = 0 chunk_type = 15 chunk_length = 1057 total_length = 1170 __FUNCTION__ = "parsing_hepv3_message" #12 0x00007f19e059b264 in hepv3_received (buf=0xa35380 <buf> "HEP3\004\222", len=1170, ri=0x7ffc998190c0) at hep.c:231 __FUNCTION__ = "hepv3_received" #13 0x00007f19e05999cb in hep_msg_received (data=0x7ffc998190a0) at hep.c:85 srevp = 0x7ffc998190a0 buf = 0xa35380 <buf> "HEP3\004\222" len = 0x7ffc99819074 ri = 0x7ffc998190c0 __FUNCTION__ = "hep_msg_received" heph = 0xa35380 <buf> #14 0x000000000049e3e1 in sr_event_exec (type=7, data=0x7ffc998190a0) at core/events.c:263 ret = 0 i = 7 #15 0x000000000048721a in udp_rcv_loop () at core/udp_server.c:466 sredp = {0xa35380 <buf>, 0x7ffc99819074, 0x7ffc998190c0} len = 1170 buf = "HEP3\004\222\000\000\000\001\000\a\002\000\000\000\002\000\a\021\000\000\000\a\000\b\023\304\000\000\000\b\000\b\023\304\000\000\000\t\000\n\237/JY\000\000\000\n\000\n}\354\005\000\000\000\000\v\000\a\001\000\000\000\f\000\n\000\000\000\000\000\000\000\003\000\n\331tx\367\000\000\000\004\000\n\254\024\025\004\000\000\000\016\000\024buschMyHep2001\000\000\000\017\004!REGISTER sip:sipgate.de SIP/2.0\r\nVia: SIP/2.0/UDP 217.116.120.247;branch=z9hG4bK0"... tmp = 0x52f3ea <init_child+52> "\311\303UH\211\345AWAVAUATSH\203\354\070H\211}\270H\203}\270" from = 0x7f19e3968030 fromlen = 16 ri = {src_ip = {af = 2, len = 4, u = {addrl = {16777343, 139749169093632}, addr32 = {16777343, 0, 3818183680, 32537}, addr16 = {127, 256, 0, 0, 56320, 58260, 32537, 0}, addr = "\177\000\000\001\000\000\000\000\000\334\224\343\031\177\000"}}, dst_ip = { af = 2, len = 4, u = {addrl = {0, 0}, addr32 = {0, 0, 0, 0}, addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, addr = '\000' <repeats 15 times>}}, src_port = 42940, dst_port = 9060, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = {sa_family = 2, sa_data = "\247\274\177\000\000\001\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 48295, sin_addr = {s_addr = 16777343}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 48295, sin6_flowinfo = 16777343, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0x7f19e394da80, proto = 1 '\001'} __FUNCTION__ = "udp_rcv_loop" #16 0x0000000000422c08 in main_loop () at main.c:1625 i = 1 pid = 0 si = 0x7f19e394da80 si_desc = "udp receiver child=1 sock=0.0.0.0:9060\000\000\276\250s\000\000\000\000\000Z\261s\000\000\000\000\000\000\242\311\234\177\306\067\212\004\000\000\000\000\000\000\000\220uA\000\000\000\000\000\b/x\000\000\000\000\000\a\000\000\000\000\000\000\000\017", '\000' <repeats 15 times>, "\220\222\201\231\374\177\000\000i$_\000\000\000\000" nrprocs = 4 woneinit = 1 __FUNCTION__ = "main_loop" #17 0x000000000042a308 in main (argc=13, argv=0x7ffc99819568) at main.c:2646 cfg_stream = 0x118b010 c = -1 r = 0 tmp = 0x7ffc99819f00 "" tmp_len = -468663896 port = 32537 proto = -1719561184 options = 0x738938 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 2544599327 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x1 <error: Cannot access memory at address 0x1> st = {st_dev = 15, st_ino = 11439, st_nlink = 2, st_mode = 16832, st_uid = 118, st_gid = 301, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = { tv_sec = 1495618022, tv_nsec = 508564058}, st_mtim = {tv_sec = 1498034038, tv_nsec = 560355778}, st_ctim = {tv_sec = 1498034038, tv_nsec = 560355778}, __glibc_reserved = {0, 0, 0}} __FUNCTION__ = "main" No symbol table info available. 1829 main.c: No such file or directory. ``` #### Log Messages This is what debug log says (trimmed down to the essential lines): ``` root@busch:/var/cores# systemctl restart kamailio_li_sniffer.service && kamcmd cfg.get config foo && tail -f /var/log/kamailio/proxy.log hello Daniel [..] Jun 21 10:34:39 busch /usr/sbin/kamailio[7998]: DEBUG: <core> [core/parser/msg_parser.c:600]: parse_msg(): SIP Request: Jun 21 10:34:39 busch /usr/sbin/kamailio[7998]: DEBUG: <core> [core/parser/msg_parser.c:602]: parse_msg(): method: <REGISTER> Jun 21 10:34:39 busch /usr/sbin/kamailio[7998]: DEBUG: <core> [core/parser/msg_parser.c:604]: parse_msg(): uri: <sip:sipgate.de> Jun 21 10:34:39 busch /usr/sbin/kamailio[7998]: DEBUG: <core> [core/parser/msg_parser.c:606]: parse_msg(): version: <SIP/2.0> [..] Jun 21 10:34:39 busch /usr/sbin/kamailio[7999]: DEBUG: <core> [core/receive.c:234]: receive_msg(): preparing to run routing scripts... Jun 21 10:34:39 busch /usr/sbin/kamailio[8001]: INFO: <script>: Reading config.foo into variable Jun 21 10:34:39 busch /usr/sbin/kamailio[8000]: INFO: <script>: Reading config.foo into variable Jun 21 10:34:39 busch /usr/sbin/kamailio[7999]: INFO: <script>: Reading config.foo into variable Jun 21 10:34:39 busch /usr/sbin/kamailio[8001]: DEBUG: <core> [core/select.c:412]: run_select(): Calling SELECT 0x7f19e3965f60 Jun 21 10:34:39 busch /usr/sbin/kamailio[7999]: DEBUG: <core> [core/select.c:412]: run_select(): Calling SELECT 0x7f19e3965f60 Jun 21 10:34:39 busch /usr/sbin/kamailio[8000]: DEBUG: <core> [core/select.c:412]: run_select(): Calling SELECT 0x7f19e3965f60 Jun 21 10:34:39 busch /usr/sbin/kamailio[8010]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 11 Jun 21 10:34:39 busch /usr/sbin/kamailio[8010]: DEBUG: <core> [core/tcp_main.c:3456]: handle_ser_child(): dead child 1, pid 7998 (shutting down?) Jun 21 10:34:39 busch /usr/sbin/kamailio[8010]: DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0xa4c100, 11, -1, 0x0) fd_no=18 called Jun 21 10:34:39 busch /usr/sbin/kamailio[8010]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 14 Jun 21 10:34:39 busch /usr/sbin/kamailio[8010]: DEBUG: <core> [core/tcp_main.c:3456]: handle_ser_child(): dead child 4, pid 8001 (shutting down?) Jun 21 10:34:39 busch /usr/sbin/kamailio[8010]: DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0xa4c100, 14, -1, 0x0) fd_no=17 called Jun 21 10:34:39 busch /usr/sbin/kamailio[7996]: ALERT: <core> [main.c:743]: handle_sigs(): child process 7998 exited by a signal 11 Jun 21 10:34:39 busch /usr/sbin/kamailio[7996]: ALERT: <core> [main.c:746]: handle_sigs(): core was generated Jun 21 10:34:39 busch /usr/sbin/kamailio[7996]: INFO: <core> [main.c:768]: handle_sigs(): terminating due to SIGCHLD Jun 21 10:34:39 busch /usr/sbin/kamailio[7996]: DEBUG: <core> [main.c:770]: handle_sigs(): terminating due to SIGCHLD Jun 21 10:34:39 busch /usr/sbin/kamailio[8010]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 21 10:34:39 busch /usr/sbin/kamailio[8009]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 21 10:34:39 busch /usr/sbin/kamailio[8008]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 21 10:34:39 busch /usr/sbin/kamailio[8007]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 21 10:34:39 busch /usr/sbin/kamailio[8006]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 21 10:34:39 busch /usr/sbin/kamailio[8005]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 21 10:34:39 busch /usr/sbin/kamailio[8002]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 21 10:34:39 busch /usr/sbin/kamailio[8003]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 21 10:34:39 busch /usr/sbin/kamailio[8004]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received [..] ``` #### SIP Traffic The SIP traffic doesn't matter. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.9.2 ``` * **Operating System**: ``` Debian Jessie Linux busch.dev.sipgate.net 3.16.0-4-amd64 #1 SMP Debian 3.16.39-1+deb8u1 (2017-02-22) x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1159

4 9

[kamailio/kamailio] tr_lookup(): error parsing [{param.count, , }] (#1041)
by Sergey Lavrov 08 Dec '18

08 Dec '18

Kamailio can't parse construction like $(hdr(History-Info)[*]{param.count,,}) where delimiter is comma. I tried to use delimiter as , / ',' / "," wuthout success. ERROR: pv [pv_trans.c:2631]: tr_parse_paramlist(): invalid separator in transformation: count,,} ERROR: <core> [pvapi.c:1629]: tr_lookup(): error parsing [{param.count,,}] ERROR: <core> [pvapi.c:1010]: pv_parse_spec2(): bad tr in pvar name "hdr" ERROR: <core> [pvapi.c:1036]: pv_parse_spec2(): invalid parsing in [$(hdr(History-Info)[*]{param.count,,})] at (4) ERROR: pv [pv_trans.c:2639]: tr_parse_paramlist(): invalid name transformation: count,','}! ERROR: <core> [pvapi.c:1629]: tr_lookup(): error parsing [{param.count,','}] ERROR: <core> [pvapi.c:1010]: pv_parse_spec2(): bad tr in pvar name "hdr" ERROR: <core> [pvapi.c:1036]: pv_parse_spec2(): invalid parsing in [$(hdr(History-Info)[*]{param.count,','})] at (4) ERROR: bad config file (1 errors) ERROR: pv [pv_trans.c:2639]: tr_parse_paramlist(): invalid name transformation: count,","}! ERROR: <core> [pvapi.c:1629]: tr_lookup(): error parsing [{param.count,","}] ERROR: <core> [pvapi.c:1010]: pv_parse_spec2(): bad tr in pvar name "hdr" ERROR: <core> [pvapi.c:1036]: pv_parse_spec2(): invalid parsing in [$(hdr(History-Info)[*]{param.count,","})] at (4) kamailio -v version: kamailio 4.4.5 (x86_64/linux) f98162 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: f98162 compiled on 03:47:31 Feb 27 2017 with gcc 4.8.5 -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1041

2 10

[kamailio/kamailio] pkg/kamailio: Fix of ticket 1085 (#1086)
by sergey-safarov 09 Oct '18

09 Oct '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1086 -- Commit Summary -- * pkg/kamailio: Fix of ticket 1085 -- File Changes -- M pkg/kamailio/centos/7/kamailio.service (2) M pkg/kamailio/deb/debian/kamailio.service (2) M pkg/kamailio/deb/jessie/kamailio.service (2) M pkg/kamailio/deb/sid/kamailio.service (2) M pkg/kamailio/deb/stretch/kamailio.service (2) M pkg/kamailio/deb/xenial/kamailio.service (2) M pkg/kamailio/fedora/17/kamailio.service (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1086.patch https://github.com/kamailio/kamailio/pull/1086.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1086

4 15

[kamailio] recover htable replication through dmq after kamailio restart (#260)
by José Seabra 05 Oct '18

05 Oct '18

(Feature request) be able to recover data from htable variable when kamailio starts, from another kamailio instances through dmq module. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/260

4 5

[kamailio/kamailio] Makefile.defs: default locks review (#1035)
by Daniel-Constantin Mierla 27 Sep '18

27 Sep '18

Apparently the default locks are set to PTHREAD mutex, when the architecture is not handled explicitely. It should be reviewed and eventually switch to standard POSIX, they should work everywhere while PTHREAD are targeting threads and work only in few cases for processes. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1035

2 6

[kamailio] feature request: sample config for federation / peering with repro (#531)
by Daniel Pocock 27 Sep '18

27 Sep '18

repro servers peer with each other in a federated manner just like SMTP servers for email, but using TLS mutual authentication to prevent impersonation. Kamailio has TLS support and should be able to talk to such servers and other Kamailio servers in the same way. It would be good to create a recommended sample configuration for this type of service and also add it to the RTC Quick Start Guide: http://rtcquickstart.org/guide/multi/sip-proxy.html --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/531

3 8

[kamailio/kamailio] ERROR: cnxcc terminate_call(): Error executing dlg_end_dlg command. Return code was [404] (#1051)
by Dipen Patel 13 Sep '18

13 Sep '18

### Description  #### Log Messages ``` terminate_call(): Error executing dlg_end_dlg command. Return code was [404] Apr 1 06:49:56 sip /usr/sbin/kamailio[1316]: ALERT: cnxcc [cnxcc_check.c:81]: check_calls_by_money(): [S2N5rn7nlu] call has exhausted its credit. Breaking the loop ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamctl -v /usr/sbin/kamctl 4.2.0 ``` * **Operating System**: ``` Centos 6 64bit ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1051

3 5

[kamailio/kamailio] ERROR searching pvar "uac_req" in sample kamailio.cfg config file for PCSCF (#1123)
by vhuertas 13 Sep '18

13 Sep '18

### Description I have configured a kamailio as PCSCF taking the configuration sample files (kamailio.cfg and pcscf.cfg) in https://github.com/kamailio/kamailio/tree/master/misc/examples/pcscf The version of kamailio installed is the 5.1. When I perform "service pcscf start" the services doesn't restart giving a parsing error for a pseudo variable called $uac_req. The error is found in this section: route[NATPING] { route(preload_pcscf); sht_iterator_start("nat_iterator", "natping"); while(sht_iterator_next("nat_iterator")) { xlog("OPTIONS to $shtitval(nat_iterator) via $shtitkey(nat_iterator)...\n"); $uac_req(method) = "OPTIONS"; $uac_req(ruri) = $shtitval(nat_iterator); $uac_req(furi) = PCSCF_URL; $uac_req(turi) = $shtitval(nat_iterator); $uac_req(ouri) = $shtitkey(nat_iterator); $uac_req(evroute) = 1; uac_req_send(); } sht_iterator_end("nat_iterator"); } I have checked that I have only one "uac.so" file in /usr/lib64/kamailio/modules/ and the date of the file is April 15th. So I guess that the file is updated. ### Troubleshooting #### Reproduction  #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages ERROR: <core> [core/pvapi.c:828]: pv_parse_spec2(): error searching pvar "uac_req" 0(2271) ERROR: <core> [core/pvapi.c:1032]: pv_parse_spec2(): wrong char [m/109] in [$uac_req(method)] at [9 (5)] 0(2271) CRITICAL: <core> [core/cfg.y:3414]: yyerror_at(): parse error in config file /etc/kamailio/pcscf/kamailio.cfg, line 906, column 3-18: Can't get from cache: $uac_req(method) ERROR: bad config file (1 errors) #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.1.0-dev2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.7.2 * **Operating System**:  Debian 8 -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1123

3 3

[kamailio] support usrloc handle_lost_tcp variable also in DB-Only scheme (#171)
by juha-h 04 Sep '18

04 Sep '18

--- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/171

2 3

[kamailio/kamailio] auth_db Deprecate email_address in database schemas (#858)
by Olle E. Johansson 03 Sep '18

03 Sep '18

I suggest we delete the "email_address" field in database schemas for auth_db. I think it was put there as an example of extendability but a lot of users seems confused about this and Kamailio by default does not use that field at all. Any opinions? If we reach an agreement we'll produce patches and clean up the various schemas. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/858

3 8

[kamailio] add GnuTLS support (#371)
by zabbal 03 Sep '18

03 Sep '18

OpenSSL is well known for huge amount of deadly security vulnerabilities, even before heartbleed. It would be nice if I could avoid bringing in such a library just because of Kamailio - having support for GnuTLS will let the user to make such a choice. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/371

4 6

[kamailio/kamailio] ims_isc module does not deliver to AS after asynchronous SAR to HSS (distinct PSI) (#1168)
by Christoph VALENTIN 03 Sep '18

03 Sep '18

### Description This is the same test case as I used for bug Report #1160 I used kamailio as an scscf (based on the configuration files from kamailio/examples/scscf) I did some changes according to my needs I did some Basic tests - the results were satisfying --> OK I configured a distinct PSI on the HSS (sip:04321234501@vict-ims.net) --> OK I registered some user from a Zoiper Client --> OK I told zoiper to call sip:04321234501@vict-ims.net --> I received 555 AS Contacting Failed - iFC terminated dialog ### Troubleshooting For some reason, the ims_isc module cannot deliver the Initial INVITE to the AS. First I thought, there was a bug in TM module, however there was no bug in TM module (please find the Explanation in issue #1160) The ims_isc module issues a CRITICAL log: File 2017_06_20_distinct_psi_03_scscf_kamailio.log: Line 642 - 660: Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: INFO: ims_registrar_scscf [cxdx_avp.c:138]: cxdx_get_avp(): cxdx_get_experimental_result_code: Failed finding avp Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: INFO: ims_registrar_scscf [cxdx_sar.c:84]: create_return_code(): created AVP successfully : [saa_return_code] - [1] Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=127 a=26 n=xlog Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=143 a=21 n=switch Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=130 a=26 n=xlog Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=131 a=5 n=route Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=673 a=26 n=xlog Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=675 a=24 n=t_newtran Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: tm [tm.c:1316]: w_t_newtran(): ERROR: t_newtran: transaction already in process 0x7ff2a6e66a58 Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=677 a=25 n=set_dlg_profile Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=692 a=16 n=if Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=685 a=25 n=is_method Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=686 a=63 n=assign Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=687 a=63 n=assign Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=688 a=24 n=record_route Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=698 a=16 n=if Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=692 a=26 n=isc_match_filter Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: INFO: ims_isc [mod.c:233]: isc_match_filter(): Checking triggers Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: CRITICAL: ims_isc [mod.c:284]: isc_match_filter(): SKIP: 0 #### Reproduction I can help to reproduce the issue. mailto:christoph.valentin@kapsch.net Currently I have got an experimental test setup using Zoiper Clients. After week 27 I should have simulated test cases to repeat the Scenario "per mouse-click" #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` [logs-tshark-routes_2017_06_21.zip](https://github.com/kamailio/kamailio/fil… ``` #### SIP Traffic  ``` sip || diameter traffic at the s-cscf (172.29.21.23) [logs-tshark-routes_2017_06_21.zip](https://github.com/kamailio/kamailio/fil… ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@vict-ims ~]# kamailio -v version: kamailio 4.4.5 (x86_64/linux) b0945e-dirty flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: b0945e -dirty compiled on 20:06:13 Jun 7 2017 with gcc 4.8.5 [root@vict-ims ~]# ``` * **Operating System**:  ``` [root@vict-ims ~]# uname -a Linux vict-ims 3.10.0-229.el7.x86_64 #1 SMP Thu Jan 29 18:37:38 EST 2015 x86_64 x86_64 x86_64 GNU/Linux [root@vict-ims ~]# ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1168

2 8

[kamailio] set_contact_alias is not applied (#445)
by Olle E. Johansson 20 Jun '18

20 Jun '18

If I run set_contact_alias nothing happens - the contact remains the same on the outbound message There's no error returned and debug logs indicate a proper header However, if I add "msg_apply_changes()" on the line after set_contact_alias the Contact sent to next hop has the alias content No other changes --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/445

3 19

[kamailio/kamailio] I_perform_user_authorization_request(): no int value param passed (#1099)
by riccardovarotto 04 May '18

04 May '18

### Description Using I-CSCF Kamailio module with 5.0.1 version we got the error: "I_perform_user_authorization_request(): no int value param passed" Same configuration file works well on 5.0.0 version  ### Troubleshooting #### Reproduction  #### Debugging Data 1(26715) ERROR: *** cfgtrace:request_route=[register] c=[/etc/KAMAILIO_ASTERISK_CFG/IMS_5/icscf/./kamailio.cfg] l=374 a=26 n=I_perform_user_authorization_request 1(26715) ERROR: <core> [core/sr_module.c:1766]: get_int_fparam(): Unexpected param type: 1280329042 1(26715) ERROR: ims_icscf [registration.c:78]: I_perform_user_authorization_request(): no int value param passed 1(26715) ERROR: *** cfgtrace:request_route=[register] c=[/etc/KAMAILIO_ASTERISK_CFG/IMS_5/icscf/./kamailio.cfg] l=375 a=26 n=send_reply [log_ko.gz](https://github.com/kamailio/kamailio/files/961675/log_ko.gz) [kamailio.cfg.txt](https://github.com/kamailio/kamailio/files/961677/kamaili…  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1099

5 11

[kamailio] error while dumping dialog via RPC (#145)
by Savolainen Dmitri 01 May '18

01 May '18

In part of profiles and/or variables section while using `static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, int with_context) ` May be it is an error of ctl module ``` # kamcmd dlg.list { h_entry: 6718 h_id: 20440 call-id: 48c9fe85f6750163(a)192.168.5.60 from_uri: sip:000*051@xxxxxx.xx:5068 to_uri: sip:002@xxxxxx.xx:5068 state: 4 start_ts: 1430324850 init_ts: 1430324847 timeout: 1430368049 lifetime: 43200 dflags: 515 sflags: 0 iflags: 0 caller: { tag: bda5e24faa4c4ff5 contact: sip:000*051@192.168.5.60:5066;transport=udp;alias=xxx.xxx.78.202~5066~1 cseq: 5457 route_set: socket: udp:xxx.xxx.66.150:5068 } callee: { tag: 4y2gjr7N9231K contact: sip:002@xxx.xxx.66.151:5080;transport=udp cseq: 0 route_set: socket: udp:xxx.xxx.66.150:5068 } profiles: { ERROR while parsing the record 62, @698: 03 : bad record ``` --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/145

4 6

[kamailio/kamailio] Kamailio + rsyslog, still writing logs to /var/log/syslog in DEBUG_MODE (#1070)
by Fyodor 17 Mar '18

17 Mar '18

Ubuntu 16.04.2 LTS version: kamailio 4.3.4 (x86_64/linux) /etc/kamailio/kamailio.cfg: ``` ### LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR #!ifdef WITH_DEBUG debug=4 log_stderror=yes #!else debug=2 log_stderror=no #!endif memdbg=5 memlog=5 log_facility=LOG_LOCAL0 ``` /etc/rsyslog.d/50-default.conf ``` local0.* -/var/log/kamailio.log ``` kamailio.log file ``` -rw-r--r-- 1 syslog adm 1788189 Apr 14 12:09 /var/log/kamailio.log ``` If i disable WITH_DEBUG in kamailio config - it writes log to /var/log/kamailio.log, if i enable it - kamailio write logs to /var/log/syslog. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1070

4 5

[kamailio/kamailio] db_cassandra can't find table version (#618)
by goharahmed 03 Mar '18

03 Mar '18

Hi devs, I'm trying to make the db_cassandra work for my kamailio specifically userblacklist module. I've cassanda keyspace and tables defined along with the db_schema directory structure defined as instructed however the debug logs keep telling me that table 'version' doesn't exist. I've taken a look inside the dbcassa_table.c file https://github.com/kamailio/kamailio/blob/master/modules/db_cassandra/dbcas… Somewhere in this function it just doesn't get hold of "tbc" and hence it throws up error. Here is how I've figured out this code. hash = core_hash(dbn, tbn, DBCASSA_TABLE_SIZE); **if(!hash) LM_ERR("hash NOT FOUND\n");** hashidx = hash % DBCASSA_TABLE_SIZE; **if(!hashidx) LM_ERR("hashidx NOT FOUND\n");** ref_read_data(dbcassa_tbl_htable[hashidx].lock); tbc = dbcassa_tbl_htable[hashidx].dtp; **if(!tbc) LM_ERR("TBC NOT FOUND\n");** while(tbc) { LM_DBG("found dbname=%.*s, table=%.*s\n", tbc->dbname.len, tbc->dbname.s, tbc->name.len, tbc->name.s); if(tbc->hash==hash && tbc->dbname.len == dbn->len && tbc->name.len == tbn->len && !strncasecmp(tbc->dbname.s, dbn->s, dbn->len) && !strncasecmp(tbc->name.s, tbn->s, tbn->len)) { memcpy(full_path_buf + dbcassa_schema_path.len, dbn->s, dbn->len); len = dbcassa_schema_path.len + dbn->len; full_path_buf[len++] = '/'; memcpy(full_path_buf + len, tbn->s, tbn->len); full_path_buf[len + tbn->len] = '\0'; if(dbcassa_check_mtime(&tbc->mt) == 0) return tbc; old_tbc = tbc; break; } tbc = tbc->next; } unref_read_data(dbcassa_tbl_htable[hashidx].lock); **if(!old_tbc) { LM_ERR("OLD_TBC NOT FOUND\n");** return NULL; } and upon starting of kamailio after recompiling the module I see these lines printed. 0(15574) DEBUG: db_cassandra [dbcassa_base.cpp:149]: db_cassa_new_connection(): opening connection: cassa://xxxx:xxxx@127.0.0.1:9160/kamailio 0(15574) DEBUG: <core> [mem/f_malloc.c:439]: fm_malloc(): fm_malloc(0x7f9c14f8a010, 48) called from db_cassandra: dbcassa_base.cpp: db_cassa_new_connection(155) 0(15574) DEBUG: <core> [mem/f_malloc.c:514]: fm_malloc(): fm_malloc(0x7f9c14f8a010, 48) returns address 0x7f9c150055f0 0(15574) DEBUG: db_cassandra [dbcassa_base.cpp:161]: db_cassa_new_connection(): 0x7f9c150055f0=pkg_malloc(48) 0(15574) DEBUG: db_cassandra [dbcassa_base.cpp:117]: dbcassa_open(): Opened connection to Cassandra cluster 127.0.0.1:9160 0(15574) DEBUG: db_cassandra [dbcassa_base.cpp:955]: db_cassa_query(): query table=version **0(15574) ERROR: db_cassandra [dbcassa_table.c:463]: dbcassa_db_get_table(): TBC NOT FOUND 0(15574) ERROR: db_cassandra [dbcassa_table.c:486]: dbcassa_db_get_table(): OLD_TBC NOT FOUND** 0(15574) ERROR: db_cassandra [dbcassa_base.cpp:449]: cassa_translate_query(): table version does not exist! 0(15574) ERROR: db_cassandra [dbcassa_base.cpp:962]: db_cassa_query(): Failed to query Cassandra cluster 0(15574) ERROR: <core> [db.c:397]: db_table_version(): error in db_query 0(15574) ERROR: <core> [db.c:436]: db_check_table_version(): querying version for table userblacklist 0(15574) ERROR: userblacklist [db_userblacklist.c:86]: userblacklist_db_init(): during table version check. 0(15574) DEBUG: <core> [db_pool.c:100]: pool_remove(): removing connection from the pool 0(15574) DEBUG: <core> [mem/f_malloc.c:575]: fm_free(): fm_free(0x7f9c14f8a010, 0x7f9c150055f0), called from db_cassandra: dbcassa_base.cpp: db_cassa_free_connection(203) 0(15574) DEBUG: <core> [mem/f_malloc.c:594]: fm_free(): fm_free: freeing block alloc'ed from db_cassandra: dbcassa_base.cpp: db_cassa_new_connection(155) 0(15574) DEBUG: <core> [mem/f_malloc.c:575]: fm_free(): fm_free(0x7f9c14f8a010, 0x7f9c15005318), called from core: db.c: db_do_close(356) 0(15574) DEBUG: <core> [mem/f_malloc.c:594]: fm_free(): fm_free: freeing block alloc'ed from core: db.c: db_do_init2(298) 0(15574) ERROR: <core> [sr_module.c:968]: init_mod(): Error while initializing module userblacklist (/usr/local/lib64/kamailio/modules/userblacklist.so) ERROR: error while initializing modules Kindly look into this and let me know how to make this work. Thanks, Sammy --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/618

3 14

[kamailio/kamailio] Problem with topos together with track_cseq_updates (#1038)
by lamSteven 01 Mar '18

01 Mar '18

### Description When using the dialog track_cseq_updates feature (to increase the cseq for calls that are authenticated using the uac uac_auth) together with topos, it seems like a reply is not handled by topos. #### Log Messages I have a 2219 line debug log demonstrating this, i can supply this on request. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1038

4 15

[kamailio] [Feature request] Python3 support for app_python (#544)
by Anthony Messina 01 Mar '18

01 Mar '18

Currently, app_python old works with Python2. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/544

3 3

[kamailio] dmq_usrloc replication and max_contacts (Kamailio v4.3.1) (#265)
by 00Asgaroth00 16 Feb '18

16 Feb '18

This is a snip from the user's mailing list, I'm just adding it to the issue tracker, as it is yet to be confirmed as a bug, only here for tracking pruporses: ``` I have a situation where I have 2 devices registering with the same AOR, I have the registrar module's max_contacts parameter set to 1 and I use the 0x04 flag on the save function. When I use dmq_usrloc for replication, I can see 2 contacts registered for the AOR on the "client" nodes whereas the node where the actual registration took place only has 1 contact for the AOR. ``` ``` It seems to me like another bug, although again I'm not familiar with the module so can't be sure without looking that it is not intended behaviour. I plan to look later this week when I have some time but in the meantime, you can send me the examples directly if you like. ``` --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/265

6 17

[kamailio] having keep-alive response count before ending the dialog (#438)
by jayesh1017 12 Feb '18

12 Feb '18

Kamailio takes care of sending in-dialog keep-alives using OPTIONS when dlg_set_attribute ka-src and ka-dst is used. It also sends OPTIONS to correct address if a client sends Re-Invite indicating a network change, which is a common case with mobile clients (switching between mobile-data and Wifi) fixed in #273 The problem is that it ends the dialog on missing even one keep-alive response. Missing a response is possible when the client is handling the network change and keep-alive is sent around that time. Thus, having a configurable counter after which you expect to end the dialog might be helpful. For eg. you decide to end the dialog after we miss 3 responses for keep-alives in a row. Something like dlg_set_attribute(ka-src, 3) where 3 indicates the number of responses that can be missed before ending the dialog. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/438

4 11

[kamailio/kamailio] redis support into usrloc (#1137)
by Surendra Tiwari 12 Feb '18

12 Feb '18

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1137

6 15

git:master:b450a769: Updated P-CSCF example with additional Rx_AAR params
by Richard Good 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: b450a769cff3b5c8ea0962299f6b087da089cd59 URL: https://github.com/kamailio/kamailio/commit/b450a769cff3b5c8ea0962299f6b087… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2014-12-17T10:58:00+02:00 Updated P-CSCF example with additional Rx_AAR params --- Modified: examples/pcscf/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/b450a769cff3b5c8ea0962299f6b087… Patch: https://github.com/kamailio/kamailio/commit/b450a769cff3b5c8ea0962299f6b087… --- diff --git a/examples/pcscf/kamailio.cfg b/examples/pcscf/kamailio.cfg index c09cdc9..c2d5f55 100644 --- a/examples/pcscf/kamailio.cfg +++ b/examples/pcscf/kamailio.cfg @@ -983,7 +983,7 @@ route[Orig_Initial] #!ifdef WITH_RX xlog("L_DBG","Diameter: Orig authorizing media via Rx\n"); - if(Rx_AAR("ORIG_SESSION_AAR","orig")==0){ + if(Rx_AAR("ORIG_SESSION_AAR","orig","",-1)==0){ exit; } } @@ -1035,7 +1035,7 @@ onreply_route[Orig_Initial_reply] #!ifdef WITH_RX if (t_check_status("180|183|200")){ xlog("L_DBG","Diameter: Orig authorizing media via Rx\n"); - if(Rx_AAR("ORIG_SESSION_AAR_REPLY","orig")==0){ + if(Rx_AAR("ORIG_SESSION_AAR_REPLY","orig","",-1)==0){ exit; } } @@ -1089,7 +1089,7 @@ route[Term_Initial] #!ifdef WITH_RX xlog("L_DBG","Diameter: Term authorizing media via Rx\n"); - if(Rx_AAR("TERM_SESSION_AAR","term")==0){ + if(Rx_AAR("TERM_SESSION_AAR","term","",-1)==0){ exit; } } @@ -1138,7 +1138,7 @@ onreply_route[Term_Initial_reply] #!ifdef WITH_RX if (t_check_status("180|183|200")){ xlog("L_DBG","Diameter: Orig authorizing media via Rx\n"); - if(Rx_AAR("TERM_SESSION_AAR_REPLY","term")==0){ + if(Rx_AAR("TERM_SESSION_AAR_REPLY","term","",-1)==0){ exit; } }

2 1

git:master:419275a5: evrexec: new module to execute an event route at startup in a dedicated process
by Daniel-Constantin Mierla 08 Dec '17

08 Dec '17

Module: kamailio Branch: master Commit: 419275a588d0f655d98ac80591cbd8756803b8ee URL: https://github.com/kamailio/kamailio/commit/419275a588d0f655d98ac80591cbd87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-12T10:03:33+02:00 evrexec: new module to execute an event route at startup in a dedicated process --- Added: src/modules/evrexec/Makefile Added: src/modules/evrexec/README Added: src/modules/evrexec/doc/Makefile Added: src/modules/evrexec/doc/evrexec.xml Added: src/modules/evrexec/doc/evrexec_admin.xml Added: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/419275a588d0f655d98ac80591cbd87… Patch: https://github.com/kamailio/kamailio/commit/419275a588d0f655d98ac80591cbd87…

3 4

[kamailio/kamailio] dmq & dmq_usrloc : let server_address & notification_address use the same IP and port (#1109)
by 张顺通 10 Nov '17

10 Nov '17

if server_address & notification_address use same ip and different port(see below)，in dmq.list_nodes will have two node for one kamailio(one node for notify_server 5360 and one for dmq local 5260), question is when send REGISTER to port 5160, REGISTER will copy from port 5260 to 5360 on the same kamailio,this is not what i want. dmq & dmq_usrloc cfg(**different port**): listen=eth0:5160 listen=eth0:5260 listen=eth0:5360 modparam("dmq", "server_address", "sip:10.6.1.200:5260") modparam("dmq", "notification_address", "sip:10.6.1.200:5360") modparam("dmq", "multi_notify", 1) modparam("dmq", "num_workers", 2) # ----- dmq_usrloc params ----- modparam("dmq_usrloc", "enable", 1) modparam("dmq_usrloc", "sync", 1) modparam("dmq_usrloc", "batch_msg_contacts", 50) modparam("dmq_usrloc", "batch_msg_size", 500000) And when I let server_address & notification_address use same IP & Port, check in function add_server_and_notify will report error("error adding notification node"),child_init will return failed. So I suggest that the following changes, let server_address & notification_address can use the same IP and port： @@ -315,11 +315,15 @@ dmq_node_t* add_server_and_notify(str *paddr) for (index = 0; index < host_cnt; index++) { pstr->s = puri_list [index]; pstr->len = strlen (puri_list [index]); - if (!find_dmq_node_uri(node_list, pstr)) { // check for duplicates + if (!(pnode = find_dmq_node_uri(node_list, pstr))) { // check for duplicates pnode = add_dmq_node (node_list, pstr); if (pnode && !pfirst) { pfirst = pnode; } - } + } else { + if (!pfirst) { + pfirst = pnode; + } + } } } After Such A change, dmq.list_nodes will only have on node for (notify_server & server_addr(local)). Is there any problem with this modification? Thanks $./sbin/kamailio -v version: kamailio 5.0.1 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1109

2 3

[kamailio/kamailio] Incorrect routing of RPACK packets with topos module (#1167)
by Sergey Lavrov 08 Nov '17

08 Nov '17

### Description  Kamailio incorrectly routed RPACK packets with topos module enabled. In the same time there is no problem with topoh module enabled. It's seems like related to #1097, ### Troubleshooting #### SIP Traffic  RPACK SIP packets with Kamailio topos module: http://imgur.com/SScErQp RPACK SIP packets with Kamailio topoh module: http://imgur.com/45ch3HB ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.0-dev4 (x86_64/linux) (git revision 7dbf3fe) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 00:24:21 Jun 26 2017 with gcc 4.8.5 ``` * **Operating System**:  ``` Red Hat Enterprise Linux Server release 7.3 (Maipo) Linux 2.6.32-042stab113.21 #1 SMP Wed Mar 23 11:05:25 MSK 2016 x86_64 x86_64 x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1167

3 32

[kamailio/kamailio] pkg/kamailio/centos/7: Packages sipcapture module (#1106)
by sergey-safarov 07 Nov '17

07 Nov '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1106 -- Commit Summary -- * pkg/kamailio/centos/7: Packages sipcapture module -- File Changes -- A etc/kamailio-sipcapture.cfg (986) M pkg/kamailio/centos/7/kamailio.spec (40) A pkg/kamailio/centos/7/sipcapture.service (25) A pkg/kamailio/centos/7/sipcapture.sysconfig (12) A pkg/kamailio/centos/7/sipcapture.tmpfiles (1) M src/Makefile (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1106.patch https://github.com/kamailio/kamailio/pull/1106.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1106

2 16

[kamailio/kamailio] app_python: fix compiler warning (#924)
by Victor Seva 27 Sep '17

27 Sep '17

> Add "-fno-strict-aliasing" to compilation flags > > Fixes a slew of: > "dereferencing type-punned pointer will break strict-aliasing rules" > warnings from GCC for lines of the form: > Py_INCREF(Py_True); > and > Py_INCREF(Py_False); > > due to the cast from PyIntObject* to PyObject* > > GCC is technically correct here; see: > http://www.python.org/dev/peps/pep-3123/ > though this is unlikely to lead to non-working machine code. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/924 -- Commit Summary -- * app_python: fix compiler warning -- File Changes -- M src/modules/app_python/Makefile (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/924.patch https://github.com/kamailio/kamailio/pull/924.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/924

4 7

[kamailio/kamailio] Daemon not restated if process exited with not null code (#1085)
by sergey-safarov 17 Sep '17

17 Sep '17

Details in attached log file. [kamailio-fail.txt](https://github.com/kamailio/kamailio/files/949032/kamail… -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1085

3 4

[kamailio/kamailio] kamailio 4.4.x: Abort and coredump (#604)
by Rick 17 Aug '17

17 Aug '17

Kamailio had an abort happend and does a coredump. Sorry I doesn't have debug symbols on this machine. Kamailio: ``` root@voip-integration-cust1:~ # kamailio -V version: kamailio 4.4.0 (amd64/freebsd) d4f23c flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_PTHREAD_MUTEX, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, select, kqueue. id: d4f23c compiled on 16:52:24 Apr 30 2016 with clang 3.4 ``` Log: ``` May 4 17:55:27 <local0.crit> voip-integration-cust1 kamailio[1177]: CRITICAL: <core> [pass_fd.c:275]: receive_fd(): EOF on 12 May 4 17:55:27 <kern.info> voip-integration-cust1 kernel: pid 1147 (kamailio), uid 986: exited on signal 6 (core dumped) May 4 17:55:27 <kern.info> voip-integration-cust1 kernel: pid 1146 (kamailio), uid 986: exited on signal 6 (core dumped) May 4 17:55:27 <local0.alert> voip-integration-cust1 kamailio[1145]: ALERT: <core> [main.c:739]: handle_sigs(): child process 1147 exited by a signal 6 May 4 17:55:27 <local0.alert> voip-integration-cust1 kamailio[1145]: ALERT: <core> [main.c:742]: handle_sigs(): core was generated May 4 17:55:27 <kern.info> voip-integration-cust1 kernel: pid 1148 (kamailio), uid 986: exited on signal 6 (core dumped) ``` Backtrace: ``` #0 0x000000080110235a in thr_kill () from /lib/libc.so.7 #1 0x0000000801102346 in raise () from /lib/libc.so.7 #2 0x00000008011022c9 in abort () from /lib/libc.so.7 #3 0x0000000800e3195a in pthread_attr_getaffinity_np () from /lib/libthr.so.3 #4 0x0000000800e2d046 in pthread_mutex_destroy () from /lib/libthr.so.3 #5 0x0000000805b436b5 in rpc_reply () from /usr/local/lib/kamailio/modules/tm.so #6 0x0000000805b23f18 in tm_reply_mutex_lock () from /usr/local/lib/kamailio/modules/tm.so #7 0x0000000805b34ba2 in reply_received () from /usr/local/lib/kamailio/modules/tm.so #8 0x000000000057146b in forward_reply () #9 0x0000000000570cca in forward_reply () #10 0x00000000004682a4 in receive_msg () #11 0x0000000000645023 in udp_rcv_loop () #12 0x0000000000543cad in main_loop () #13 0x00000000005519a5 in main () ``` --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/604

3 14

[kamailio/kamailio] Wishlist #234: URI transformation to pick up URI scheme (#592)
by Olle E. Johansson 16 Aug '17

16 Aug '17

I would like the URI transformations to be more generic so one can pick up the URI scheme, like HTTP: or TEL: Just an idea --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/592

2 2

[kamailio/kamailio] Do not start Kamailio if no listener address is configured (#1098)
by Sarbyn 15 Aug '17

15 Aug '17

### Description During some test on my server I forgot to configure a valid listen network address. It's my fault but Kamailio crashed with a useless message: > kamailio[4739]: segfault at 0 ip 00007f022ede5e71 sp 00007fff94033f08 error 4 in libc-2.17.so[7f022ec82000+1b6000 I think it's better to abort the startup if no listen address is specified and with an explicit error message, instead of produce a segfault and a crash without any error -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1098

4 10

[kamailio/kamailio] topos: fix PRACK message handling (#1097)
by sergey-vb 14 Aug '17

14 Aug '17

Currently PRACK was not handling properly because topos_d.b_contact field are filling only after receiving 200 OK. But PRACK is sending to 183 Progress responce. So I sink that we must filled topos_d.b_contact field after receiving 183 Progress. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1097 -- Commit Summary -- * topos: fix PRACK message handling -- File Changes -- M src/modules/topos/tps_storage.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1097.patch https://github.com/kamailio/kamailio/pull/1097.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1097

2 4

[kamailio/kamailio] Kamailio 5.0.2 suddenly stops processing traffic, then generates a core when restarting. (#1172)
by Joel Serrano 10 Aug '17

10 Aug '17

### Description Kamailio suddenly stops working (this is a production server so debug logging is disabled), when we restart it a core is generated and a segfault is logged. ### Troubleshooting The only thing I have seen is some reference to IPv6 in the backtrace. But no idea where to start looking. I'm pretty sure we will need more information, but I don't know how to read or understand backtraces, please let me know what you see in it so I can dig deeper into this problem. #### Reproduction I don't know how to reproduce yet, first I have to understand the cause. #### Debugging Data Backtrace: ``` [New LWP 12052] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/sbc.cfg -'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007efcf3b5df69 in ?? () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 #0 0x00007efcf3b5df69 in ?? () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #1 0x00007efcf3b5e234 in OPENSSL_cleanup () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #2 0x00007efcf7721910 in __run_exit_handlers (status=0, listp=0x7efcf7a855d8 <__exit_funcs>, run_list_atexit=run_list_atexit@entry=true, run_dtors=run_dtors@entry=true) at exit.c:83 atfct = <optimized out> onfct = <optimized out> cxafct = <optimized out> f = <optimized out> #3 0x00007efcf772196a in __GI_exit (status=<optimized out>) at exit.c:105 No locals. #4 0x000055f0a9483d54 in handle_sigs () at main.c:699 chld = 845005216 chld_status = 845005248 any_chld_stopped = 32766 memlog = 0 __func__ = "handle_sigs" #5 0x000055f0a948ea43 in main_loop () at main.c:1758 i = 8 pid = 12091 si = 0x0 si_desc = "udp receiver child=7 sock=[2602:FF37:0:1:0:0:C601:377A]:5060\000\367v\215\200\262+\363\372~\000\000\025\067\236\003\000\000\000\000\300\017H\251\360U\000\000\340\305]2\376\177", '\000' <repeats 18 times>, "\020\303]2\376\177\000\000a\202g\251\360U\000" nrprocs = 8 woneinit = 1 __func__ = "main_loop" #6 0x000055f0a9494fb9 in main (argc=13, argv=0x7ffe325dc5e8) at main.c:2646 cfg_stream = 0x55f0aa7fb010 c = -1 r = 0 tmp = 0x7ffe325dceb6 "" tmp_len = -133383536 port = 32508 proto = 845006016 options = 0x55f0a97d80e8 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 3679304743 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0xffffffff <error: Cannot access memory at address 0xffffffff> st = {st_dev = 19, st_ino = 14769, st_nlink = 2, st_mode = 16832, st_uid = 109, st_gid = 113, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1498523393, tv_nsec = 731915583}, st_mtim = {tv_sec = 1498533865, tv_nsec = 274210743}, st_ctim = {tv_sec = 1498533865, tv_nsec = 274210743}, __glibc_reserved = {0, 0, 0}} __func__ = "main" ``` Info locals: ``` [New LWP 12052] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/sbc.cfg -'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007efcf3b5df69 in ?? () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. ``` List: ``` [New LWP 12052] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/sbc.cfg -'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007efcf3b5df69 in ?? () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 ``` #### Log Messages We have regular logging with no issues, then suddenly we get: ``` Jun 28 01:57:51 kam-1 sbc[12075]: WARNING: <script>: [DISPATCHER] - Destination down: OPTIONS sip:A.A.A.A:5060 (<null>) Jun 28 01:57:51 kam-1 sbc[12075]: WARNING: <script>: [DISPATCHER] - Destination down: OPTIONS sip:B.B.B.B:5060 (<null>) Jun 28 01:58:40 kam-1 sbc[12076]: NOTICE: <script>: Node unavailable, trying next sip:A.A.A.A:5060 - M=INVITE R=sip:+12345678900@A.A.A.A:5060 ID=334f3vqDtj Jun 28 01:58:40 kam-1 sbc[12076]: NOTICE: <script>: Forwarding request - M=INVITE R=sip:+12345678900@A.A.A.A:5060 ID=334f3vqDtj Jun 28 01:58:55 kam-1 sbc[12075]: WARNING: dialog [dlg_handlers.c:1574]: dlg_ontimeout(): timeout for dlg with CallID '00g4gNy5KZ' and tags 'FHmrD-CM3' 'SZ3a5Sg58c5pB' Jun 28 01:58:55 kam-1 sbc[12075]: WARNING: dialog [dlg_handlers.c:1574]: dlg_ontimeout(): timeout for dlg with CallID 'Kj7uLRzJfd' and tags 'wRSVjfGaT' 'yQHvjNaZ5Z3rc' Jun 28 01:58:55 kam-1 sbc[12075]: WARNING: dialog [dlg_handlers.c:1574]: dlg_ontimeout(): timeout for dlg with CallID 'S5QUIXtS6-' and tags 'FV4ySEouz' 'eS7F910ycNg8H' Jun 28 01:59:10 kam-1 sbc[12075]: ERROR: <script>: No available gateways - M=INVITE R=sip:+12345678900@B.B.B.B:5060 ID=334f3vqDtj Jun 28 02:01:45 kam-1 sbc[12080]: NOTICE: dialog [dlg_hash.c:248]: dlg_clean_run(): dialog in delete state is too old (0x7efaf3904008 ref 1) Jun 28 02:03:15 kam-1 sbc[12080]: NOTICE: dialog [dlg_hash.c:248]: dlg_clean_run(): dialog in delete state is too old (0x7efaf40f0f50 ref 1) Jun 28 02:04:45 kam-1 sbc[12080]: NOTICE: dialog [dlg_hash.c:248]: dlg_clean_run(): dialog in delete state is too old (0x7efaf4d92108 ref 1) Jun 28 02:55:59 kam-1 sbc[12071]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 28 02:55:59 kam-1 sbc[12052]: NOTICE: <core> [main.c:696]: handle_sigs(): Thank you for flying kamailio!!! ``` NOTE: The process stops logging at 02:04:45, then at 02:55:59 we manually restart kamailio and a core is generated. Also, in `dmesg` we have: ``` [138953.744199] kamailio[12052]: segfault at 7efaf32f51b8 ip 00007efcf3b5df69 sp 00007ffe325dc0c0 error 4 in libcrypto.so.1.1[7efcf39f6000+265000] ``` #### SIP Traffic I don't have sip traffic, If required I can start capturing it. ### Additional Information ``` # kamailio -v version: kamailio 5.0.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 6.3.0 # ``` ``` # dpkg -l | grep kamailio ii kamailio 5.0.2+stretch amd64 very fast, dynamic and configurable SIP server ii kamailio-dbg:amd64 5.0.2+stretch amd64 very fast and configurable SIP server [debug symbols] ii kamailio-extra-modules:amd64 5.0.2+stretch amd64 Extra modules for the Kamailio SIP Server ii kamailio-tls-modules:amd64 5.0.2+stretch amd64 TLS support for the Kamailio SIP server (authentication, transport) # ``` ``` # dpkg -l |grep libssl ii libssl1.0.2:amd64 1.0.2l-2 amd64 Secure Sockets Layer toolkit - shared libraries ii libssl1.1:amd64 1.1.0f-3 amd64 Secure Sockets Layer toolkit - shared libraries# ``` * **Operating System**: ``` # uname -a Linux kam-1 4.9.0-3-amd64 #1 SMP Debian 4.9.30-2+deb9u1 (2017-06-18) x86_64 GNU/Linux ``` ``` # lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 9.0 (stretch) Release: 9.0 Codename: stretch # ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1172

2 25

[kamailio/kamailio] pkg/kamailio: Fixed systemd unit failure on server boot (#1148)
by sergey-safarov 01 Aug '17

01 Aug '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1148 -- Commit Summary -- * pkg/kamailio: Fixed systemd unit failure on server boot -- File Changes -- M pkg/kamailio/centos/7/kamailio.service (4) M pkg/kamailio/fedora/17/kamailio.service (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1148.patch https://github.com/kamailio/kamailio/pull/1148.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1148

2 3

[kamailio/kamailio] pkg/kamailio: Fix of ticket 1085 (#1087)
by sergey-safarov 01 Aug '17

01 Aug '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1087 -- Commit Summary -- * pkg/kamailio: Fix of ticket 1085 -- File Changes -- M pkg/kamailio/centos/7/kamailio.service (2) M pkg/kamailio/deb/debian/kamailio.service (2) M pkg/kamailio/deb/jessie/kamailio.service (2) M pkg/kamailio/deb/sid/kamailio.service (2) M pkg/kamailio/deb/stretch/kamailio.service (2) M pkg/kamailio/deb/xenial/kamailio.service (2) M pkg/kamailio/fedora/17/kamailio.service (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1087.patch https://github.com/kamailio/kamailio/pull/1087.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1087

2 4

[kamailio] PID file permissions (#231)
by Arsen 26 Jul '17

26 Jul '17

ENV: Debian 8 So on most Linux systems the /var/run folder is a tmpfs and after which clears after each reboot As I try to start up kamailio after a reboot through kamctl I get the following error. "ERROR: PID file /var/run/kamailio.pid does not exist -- Kamailio start failed" Because kamailio does not have the permission to write to the /var/run folder as the kamailio user. Would it be possible to add in the "kamctl" code a section where the SPECIFIED PID LOCATION (/var/run/kamailio) is checked and if it does not exist create it as the root user and chown it to the SPECIFIED USER (kamailio)? The way I have patched it for now is to create a init script that creates a /var/run/kamailio folder and chmods it to kamailio:kamailio Thanks everyone! --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/231

6 13

Developing charging module for kamailio-ims
by Prasannakumar Merugu 05 Jul '17

05 Jul '17

Hi all, We are developing charging module for kamailio-ims. We need events event_route[dialog:start] event_route[dialog:end] for detecting call begin and call end. We have to use ims_dialog module for IMS implementation. But observed that ims_dialog module doesnt have the above said events [dialog:start and end]. How do we implement those events using ims_dialog. Is there any other way out. Kindly suggest. Thanks, Prasannakumar Merugu.

1 1

git:master:8a6f57f5: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: 8a6f57f59963e53bcf98dd39615db3980275d81b URL: https://github.com/kamailio/kamailio/commit/8a6f57f59963e53bcf98dd39615db39… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-30T15:31:22+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/8a6f57f59963e53bcf98dd39615db39… Patch: https://github.com/kamailio/kamailio/commit/8a6f57f59963e53bcf98dd39615db39… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 7ee2d2f693..7f5718db5c 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -65,7 +65,7 @@ Hugh Waite result) 4.2. http_get_redirect(connection, result) - 4.3. http_client_query(url, [post-data], result) + 4.3. http_client_query(url, [post-data], [hdrs], result) 5. Pseudovariables @@ -117,7 +117,7 @@ Hugh Waite 1.18. Short http_client config file 1.19. http_connect() usage 1.20. http_get_redirect() usage - 1.21. curl_http_query() usage + 1.21. http_client_query() usage Chapter 1. Admin Guide @@ -153,7 +153,7 @@ Chapter 1. Admin Guide 4.1. http_connect(connection, url, [content_type, data,] result) 4.2. http_get_redirect(connection, result) - 4.3. http_client_query(url, [post-data], result) + 4.3. http_client_query(url, [post-data], [hdrs], result) 5. Pseudovariables @@ -609,7 +609,7 @@ http_follow_redirect = no 4.1. http_connect(connection, url, [content_type, data,] result) 4.2. http_get_redirect(connection, result) - 4.3. http_client_query(url, [post-data], result) + 4.3. http_client_query(url, [post-data], [hdrs], result) 4.1. http_connect(connection, url, [content_type, data,] result) @@ -667,7 +667,7 @@ modparam("http_client", "httpredirect", 1); http_get_redirect("apiserver", "$var(targeturl)"); ... -4.3. http_client_query(url, [post-data], result) +4.3. http_client_query(url, [post-data], [hdrs], result) Sends HTTP GET or POST request according to URL given in “url” parameter, which is a string that may contain pseudo variables. @@ -675,6 +675,12 @@ http_get_redirect("apiserver", "$var(targeturl)"); If you want to make a POST-Request, you have to define the “post”-data, that should be submitted in that request as the second parameter. + Custom headers may be specified via “hdrs” parameter (e.g., + Content-Type). + + Either of “post-data” or “hdrs” can be also set to empty string in + order to be ignored. + If HTTP server returns a class 2xx, 3xx or 4xx reply, the first line of the reply's body (if any) is stored in “result” parameter, which must be a writable pseudo variable. @@ -689,25 +695,26 @@ http_get_redirect("apiserver", "$var(targeturl)"); utils module. It is changed to use the same base library and settings as the rest of the functions in this module. - Example 1.21. curl_http_query() usage + Example 1.21. http_client_query() usage ... # GET-Request http_client_query("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$( fu{s.escape.param})", "$var(result)"); -switch ($retcode) { - ... +switch ($rc) { + ... } ... -... # POST-Request -http_client_query("http://api.com/index.php", "r_uri=$(ru{s.escape.param})&f_uri -=$(fu{s.escape.param})", - "$var(result)"); -switch ($retcode) { - ... +http_client_query("http://api.com/index.php", + "r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escape.param})", + "$var(result)"); } ... +# POST-Request +http_client_query("http://api.com/index.php", "src=$si", + "Content-Type: text/plain", "$var(result)"); +... 5. Pseudovariables

1 0

git:master:279e622b: http_client: updated docs for http_client_query()
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: 279e622b53b636d49b207907c8f3fe60ff9e2cd3 URL: https://github.com/kamailio/kamailio/commit/279e622b53b636d49b207907c8f3fe6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T15:17:46+02:00 http_client: updated docs for http_client_query() --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/279e622b53b636d49b207907c8f3fe6… Patch: https://github.com/kamailio/kamailio/commit/279e622b53b636d49b207907c8f3fe6… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 799f47718a..9ea4f9ef3f 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -31,7 +31,7 @@ <para> The connections can either be defined with the "httpcon" module parameter or in a separate configuration file, as specified by the "config_file" module - parameter. + parameter. </para> <para> Like in SIP, the HTTP URL may need encoding to be transported safely @@ -711,21 +711,29 @@ http_get_redirect("apiserver", "$var(targeturl)"); </programlisting> </example> </section> - <section id="http_client.f.curl_http_query"> + <section id="http_client.f.http_query"> <title> - <function moreinfo="none">http_client_query(url, [post-data], result)</function> + <function moreinfo="none">http_client_query(url, [post-data], [hdrs], result)</function> </title> <para> Sends HTTP GET or POST request according to URL given in <quote>url</quote> parameter, which is a string that may contain pseudo variables. - </para> + </para> <para> If you want to make a POST-Request, you have to define the <quote>post</quote>-data, that should be submitted in that request as the second parameter. - </para> - <para> + </para> + <para> + Custom headers may be specified via <quote>hdrs</quote> parameter + (e.g., Content-Type). + </para> + <para> + Either of <quote>post-data</quote> or <quote>hdrs</quote> can be + also set to empty string in order to be ignored. + </para> + <para> If HTTP server returns a class 2xx, 3xx or 4xx reply, the first line of the reply's body (if any) is stored in <quote>result</quote> parameter, @@ -734,7 +742,7 @@ http_get_redirect("apiserver", "$var(targeturl)"); <para> Function returns reply code of HTTP reply or -1 if something went wrong. - </para> + </para> <para> This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE. @@ -744,26 +752,26 @@ http_get_redirect("apiserver", "$var(targeturl)"); It is changed to use the same base library and settings as the rest of the functions in this module. </para> <example> - <title><function>curl_http_query()</function> usage</title> + <title><function>http_client_query()</function> usage</title> <programlisting format="linespecific"> ... # GET-Request http_client_query("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", "$var(result)"); -switch ($retcode) { - ... +switch ($rc) { + ... } ... - </programlisting> - <programlisting format="linespecific"> -... # POST-Request -http_client_query("http://api.com/index.php", "r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escape.param})", - "$var(result)"); -switch ($retcode) { - ... +http_client_query("http://api.com/index.php", + "r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escape.param})", + "$var(result)"); } ... +# POST-Request +http_client_query("http://api.com/index.php", "src=$si", + "Content-Type: text/plain", "$var(result)"); +... </programlisting> </example> </section>

1 0

git:master:9c1d4cec: http_client: allow providing headers to http_client_query()
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: 9c1d4cec94b47cd0b2e69e646f2fd14b84e3cf03 URL: https://github.com/kamailio/kamailio/commit/9c1d4cec94b47cd0b2e69e646f2fd14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T15:06:24+02:00 http_client: allow providing headers to http_client_query() - lost from removed http_query() in utils --- Modified: src/modules/http_client/curl_api.c Modified: src/modules/http_client/curl_api.h Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/functions.h Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/9c1d4cec94b47cd0b2e69e646f2fd14… Patch: https://github.com/kamailio/kamailio/commit/9c1d4cec94b47cd0b2e69e646f2fd14…

1 0

git:master:fce9044e: http_client: move to next field before freeing item in fixup function
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: fce9044ece62d6b5e81330de62fa1fa402145e68 URL: https://github.com/kamailio/kamailio/commit/fce9044ece62d6b5e81330de62fa1fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T14:15:55+02:00 http_client: move to next field before freeing item in fixup function --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/fce9044ece62d6b5e81330de62fa1fa… Patch: https://github.com/kamailio/kamailio/commit/fce9044ece62d6b5e81330de62fa1fa… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index cc5c9ed497..8e73200f0e 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -679,6 +679,7 @@ int fixup_raw_http_client_conn_list(void) while (raw_conn_list != NULL) { raw_cc = raw_conn_list; + raw_conn_list = raw_conn_list->next; if (raw_cc->name.s) pkg_free(raw_cc->name.s); if (raw_cc->url.s) pkg_free(raw_cc->url.s); if (raw_cc->username.s) pkg_free(raw_cc->username.s); @@ -690,7 +691,6 @@ int fixup_raw_http_client_conn_list(void) if (raw_cc->ciphersuites.s) pkg_free(raw_cc->ciphersuites.s); if (raw_cc->http_proxy.s) pkg_free(raw_cc->http_proxy.s); pkg_free(raw_cc); - raw_conn_list = raw_conn_list->next; } return ret; }

1 0

git:master:dbcd8574: call_control: free pkg memory in case of errors when parsing params
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: dbcd85746ec1ba4a3be1af920dd2b1aad632297e URL: https://github.com/kamailio/kamailio/commit/dbcd85746ec1ba4a3be1af920dd2b1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T14:02:20+02:00 call_control: free pkg memory in case of errors when parsing params --- Modified: src/modules/call_control/call_control.c --- Diff: https://github.com/kamailio/kamailio/commit/dbcd85746ec1ba4a3be1af920dd2b1a… Patch: https://github.com/kamailio/kamailio/commit/dbcd85746ec1ba4a3be1af920dd2b1a… --- diff --git a/src/modules/call_control/call_control.c b/src/modules/call_control/call_control.c index a31892c706..e1776de61a 100644 --- a/src/modules/call_control/call_control.c +++ b/src/modules/call_control/call_control.c @@ -218,13 +218,13 @@ typedef struct CallInfo { #define CHECK_COND(cond) \ if ((cond) == 0) { \ LM_ERR("malformed modparam\n"); \ - return -1; \ + goto error; \ } #define CHECK_ALLOC(p) \ if (!(p)) { \ LM_ERR("no memory left\n"); \ - return -1; \ + goto error; \ } @@ -242,9 +242,9 @@ destroy_list(AVP_List *list) { int -parse_param(void *val, AVP_List** avps) { +cc_parse_param(void *val, AVP_List** avps) { - char *p; + char *p = NULL; str s, content; AVP_List *mp = NULL; @@ -253,6 +253,10 @@ parse_param(void *val, AVP_List** avps) { content.s = (char*) val; content.len = strlen(content.s); + if(content.len==0) { + LM_ERR("empty parameter\n"); + return -1; + } p = (char*) pkg_malloc (content.len + 1); CHECK_ALLOC(p); @@ -298,26 +302,35 @@ parse_param(void *val, AVP_List** avps) { } return 0; + +error: + if(mp) { + if(mp->pv) { + pkg_free(mp->pv); + } + pkg_free(mp); + } + return -1; } int parse_param_init(unsigned int type, void *val) { - if (parse_param(val, &cc_init_avps) == -1) + if (cc_parse_param(val, &cc_init_avps) == -1) return E_CFG; return 0; } int parse_param_start(unsigned int type, void *val) { - if (parse_param(val, &cc_start_avps) == -1) + if (cc_parse_param(val, &cc_start_avps) == -1) return E_CFG; return 0; } int parse_param_stop(unsigned int type, void *val) { - if (parse_param(val, &cc_stop_avps) == -1) + if (cc_parse_param(val, &cc_stop_avps) == -1) return E_CFG; return 0; } @@ -1233,4 +1246,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_call_control_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:e5134e8c: call_obj: free current element in case of alloc failure to its field
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: e5134e8cb64828da5f607b7c74d490c8ffaf1702 URL: https://github.com/kamailio/kamailio/commit/e5134e8cb64828da5f607b7c74d490c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T13:46:21+02:00 call_obj: free current element in case of alloc failure to its field --- Modified: src/modules/call_obj/cobj.c --- Diff: https://github.com/kamailio/kamailio/commit/e5134e8cb64828da5f607b7c74d490c… Patch: https://github.com/kamailio/kamailio/commit/e5134e8cb64828da5f607b7c74d490c… --- diff --git a/src/modules/call_obj/cobj.c b/src/modules/call_obj/cobj.c index 3a6ba31e51..cf014b659f 100644 --- a/src/modules/call_obj/cobj.c +++ b/src/modules/call_obj/cobj.c @@ -436,6 +436,8 @@ int cobj_get_timestamp(uint64_t ts, cobj_elem_t **elem, int limit) elem_new->callid.s = (char*)pkg_malloc(obj->callid.len + 1); /* +1 Zero at the end */ if (!elem_new->callid.s) { LM_ERR("Cannot allocate memory for callid\n"); + pkg_free(elem_new); + elem_new = NULL; goto clean; } memcpy(elem_new->callid.s, obj->callid.s, obj->callid.len);

1 0

git:master:145d10f5: websocket: use sizeof over the type of the pointer to be allocated
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: 145d10f5a2dcad3cbdb477aaabdc853bb606b355 URL: https://github.com/kamailio/kamailio/commit/145d10f5a2dcad3cbdb477aaabdc853… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T13:36:26+02:00 websocket: use sizeof over the type of the pointer to be allocated --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/145d10f5a2dcad3cbdb477aaabdc853… Patch: https://github.com/kamailio/kamailio/commit/145d10f5a2dcad3cbdb477aaabdc853… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index a01953959a..6af2bb039e 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -209,13 +209,13 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) /* Allocate send buffer and build frame */ frame_length = frame->payload_len + extended_length + 2; - if ((send_buf = pkg_malloc(sizeof(unsigned char) * frame_length)) + if ((send_buf = pkg_malloc(sizeof(char) * frame_length)) == NULL) { LM_ERR("allocating send buffer from pkg memory\n"); return -1; } - memset(send_buf, 0, sizeof(unsigned char) * frame_length); + memset(send_buf, 0, sizeof(char) * frame_length); send_buf[pos++] = 0x80 | (frame->opcode & 0xff); if (extended_length == 0) send_buf[pos++] = (frame->payload_len & 0xff);

1 0

git:master:5418f380: domain: use same condition to alloc and free local variable
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: 5418f380ad55618004936102273b72f1f8e36113 URL: https://github.com/kamailio/kamailio/commit/5418f380ad55618004936102273b72f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T13:32:18+02:00 domain: use same condition to alloc and free local variable --- Modified: src/modules/domain/domain.c --- Diff: https://github.com/kamailio/kamailio/commit/5418f380ad55618004936102273b72f… Patch: https://github.com/kamailio/kamailio/commit/5418f380ad55618004936102273b72f… --- diff --git a/src/modules/domain/domain.c b/src/modules/domain/domain.c index 27951c91ab..1dbdd2f5d5 100644 --- a/src/modules/domain/domain.c +++ b/src/modules/domain/domain.c @@ -258,7 +258,7 @@ int ki_lookup_domain_prefix(struct sip_msg *_msg, str *_sdomain, str *_sprefix) val.s = did; if(add_avp(flags, name, val) < 0) { LM_ERR("unable to add a new AVP '%.*s'\n", name.s.len, name.s.s); - if(_sprefix) + if(_sprefix && _sprefix->s) pkg_free(name.s.s); return -1; }

1 0

Re: [sr-dev] [kamailio/kamailio] kamctl: added DBPORT option (18e3327)
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Thanks, pushed the fix to master and 5.0 branches. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/18e3327bedc1647a5abe0d377b15b74…

1 0

git:master:4f587124: db_mysql Look for MariaDB as well as MySQL
by Olle E. Johansson 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: 4f587124998e665c5ab9df7fe14cfbb3a39a9ec8 URL: https://github.com/kamailio/kamailio/commit/4f587124998e665c5ab9df7fe14cfbb… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2017-06-30T11:00:35+02:00 db_mysql Look for MariaDB as well as MySQL --- Modified: src/modules/db_mysql/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/4f587124998e665c5ab9df7fe14cfbb… Patch: https://github.com/kamailio/kamailio/commit/4f587124998e665c5ab9df7fe14cfbb… --- diff --git a/src/modules/db_mysql/Makefile b/src/modules/db_mysql/Makefile index fd09bfcce3..c8b48f985d 100644 --- a/src/modules/db_mysql/Makefile +++ b/src/modules/db_mysql/Makefile @@ -16,6 +16,10 @@ MYSQLCFG=$(shell which mysql_config) ifeq ($(MYSQLCFG),) MYSQLCFG=$(shell which mysql_config5) endif +# If no Mysql - do we have MariaDB? +ifeq ($(MYSQLCFG),) +MYSQLCFG=$(shell which mariadb_config) +endif endif ifneq ($(MYSQLCFG),)

1 0

regarding offline charging
by Anabham Manusha 30 Jun '17

30 Jun '17

hi iam implementing ims so far i have done calling through sip clients like xlite and jitsi now i lke to add offline charging to my IMS modules.can an one suggest how can i add??

2 3

git:master:ccb368e6: core: parse fline - cast number to char for print to avoid compile warning
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: ccb368e6420c1e4849867bcdbd136d0e9a8db67d URL: https://github.com/kamailio/kamailio/commit/ccb368e6420c1e4849867bcdbd136d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T10:30:51+02:00 core: parse fline - cast number to char for print to avoid compile warning --- Modified: src/core/parser/parse_fline.c --- Diff: https://github.com/kamailio/kamailio/commit/ccb368e6420c1e4849867bcdbd136d0… Patch: https://github.com/kamailio/kamailio/commit/ccb368e6420c1e4849867bcdbd136d0… --- diff --git a/src/core/parser/parse_fline.c b/src/core/parser/parse_fline.c index 5b2d346f12..04758b2751 100644 --- a/src/core/parser/parse_fline.c +++ b/src/core/parser/parse_fline.c @@ -248,7 +248,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start* fl) if (prn) { for (t=0; t<offset; t++) if (*(buffer+t)) *(prn+t)=*(buffer+t); - else *(prn+t)=176; /* '°' */ + else *(prn+t)=(char)176; /* '°' */ LOG(L_DBG, "parsed so far: %.*s\n", offset, ZSW(prn) ); pkg_free( prn ); };

1 0

git:master:f461081a: core: dns cache - catch unknown record type to avoid compile warnings
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: f461081a400b398a8c47b1cb338ffc4bf8bd2ede URL: https://github.com/kamailio/kamailio/commit/f461081a400b398a8c47b1cb338ffc4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T10:11:50+02:00 core: dns cache - catch unknown record type to avoid compile warnings --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/f461081a400b398a8c47b1cb338ffc4… Patch: https://github.com/kamailio/kamailio/commit/f461081a400b398a8c47b1cb338ffc4… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 39bed3d315..3b0f5404c4 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -2402,6 +2402,10 @@ inline static struct hostent* dns_entry2he(struct dns_hash_entry* e) case T_AAAA: ip = ((struct aaaa_rdata*)rr->rdata)->ip6; break; + default: + LM_CRIT("wrong entry type %d for %.*s\n", + e->type, e->name_len, e->name); + return 0; } memcpy(p_addr[i], ip, len); }

1 0

git:5.0:8cdee50d: kamctl: kamdbctl - proper use of DBPORT for postgres
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: 5.0 Commit: 8cdee50d7c89c1617b68e2eff1ce646eba0c33fb URL: https://github.com/kamailio/kamailio/commit/8cdee50d7c89c1617b68e2eff1ce646… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T08:39:23+02:00 kamctl: kamdbctl - proper use of DBPORT for postgres (cherry picked from commit 17f907d5fa1267f434f422fb61e4b315e3eafb97) --- Modified: utils/kamctl/kamdbctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/8cdee50d7c89c1617b68e2eff1ce646… Patch: https://github.com/kamailio/kamailio/commit/8cdee50d7c89c1617b68e2eff1ce646… --- diff --git a/utils/kamctl/kamdbctl.pgsql b/utils/kamctl/kamdbctl.pgsql index a946f2a204..059b6faa82 100644 --- a/utils/kamctl/kamdbctl.pgsql +++ b/utils/kamctl/kamdbctl.pgsql @@ -55,8 +55,8 @@ if [ -z "$DBPORT" ] ; then CMD="psql -q -h $DBHOST -U $DBROOTUSER " DUMP_CMD="pg_dump -h $DBHOST -U $DBROOTUSER -c" else - CMD="psql -q -h $DBHOST -p $DBHOST -U $DBROOTUSER " - DUMP_CMD="pg_dump -h $DBHOST -p $DBHOST -U $DBROOTUSER -c" + CMD="psql -q -h $DBHOST -p $DBPORT -U $DBROOTUSER " + DUMP_CMD="pg_dump -h $DBHOST -p $DBPORT -U $DBROOTUSER -c" fi #################################################################

1 0

git:master:17f907d5: kamctl: kamdbctl - proper use of DBPORT for postgres
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: 17f907d5fa1267f434f422fb61e4b315e3eafb97 URL: https://github.com/kamailio/kamailio/commit/17f907d5fa1267f434f422fb61e4b31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T08:38:11+02:00 kamctl: kamdbctl - proper use of DBPORT for postgres --- Modified: utils/kamctl/kamdbctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/17f907d5fa1267f434f422fb61e4b31… Patch: https://github.com/kamailio/kamailio/commit/17f907d5fa1267f434f422fb61e4b31… --- diff --git a/utils/kamctl/kamdbctl.pgsql b/utils/kamctl/kamdbctl.pgsql index a946f2a204..059b6faa82 100644 --- a/utils/kamctl/kamdbctl.pgsql +++ b/utils/kamctl/kamdbctl.pgsql @@ -55,8 +55,8 @@ if [ -z "$DBPORT" ] ; then CMD="psql -q -h $DBHOST -U $DBROOTUSER " DUMP_CMD="pg_dump -h $DBHOST -U $DBROOTUSER -c" else - CMD="psql -q -h $DBHOST -p $DBHOST -U $DBROOTUSER " - DUMP_CMD="pg_dump -h $DBHOST -p $DBHOST -U $DBROOTUSER -c" + CMD="psql -q -h $DBHOST -p $DBPORT -U $DBROOTUSER " + DUMP_CMD="pg_dump -h $DBHOST -p $DBPORT -U $DBROOTUSER -c" fi #################################################################

1 0

git:master:4826ba74: permissions: new parameter load_backends
by Daniel-Constantin Mierla 29 Jun '17

29 Jun '17

Module: kamailio Branch: master Commit: 4826ba749a3d8589d57bc5fcb38eeb6f9e840e02 URL: https://github.com/kamailio/kamailio/commit/4826ba749a3d8589d57bc5fcb38eeb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-29T09:21:22+02:00 permissions: new parameter load_backends - control what backends should be loaded - 1 - address table - 2 - trusted table - 4 - allow file - 8 - deny file - it can be a combination (sum) of the options to load many backends - default value 0xffff (load all backends) --- Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/permissions.h --- Diff: https://github.com/kamailio/kamailio/commit/4826ba749a3d8589d57bc5fcb38eeb6… Patch: https://github.com/kamailio/kamailio/commit/4826ba749a3d8589d57bc5fcb38eeb6… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 3d50c6b0b7..f6715556a3 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -89,6 +89,8 @@ static int check_all_branches = 1; int _perm_max_subnets = 512; +int _perm_load_backends = 0xFFFF; + /* * Convert the name of the files into table index */ @@ -178,6 +180,7 @@ static param_export_t params[] = { {"mask_col", PARAM_STR, &mask_col }, {"port_col", PARAM_STR, &port_col }, {"max_subnets", PARAM_INT, &_perm_max_subnets }, + {"load_backends", PARAM_INT, &_perm_load_backends }, {0, 0, 0} }; @@ -576,33 +579,42 @@ static int double_fixup(void** param, int param_no) */ static int mod_init(void) { - if(permissions_init_rpc()!=0) - { - LM_ERR("failed to register RPC commands\n"); + if(_perm_load_backends==0) { + LM_ERR("failure - no backend to be loaded\n"); return -1; } - allow[0].filename = get_pathname(default_allow_file); - allow[0].rules = parse_config_file(allow[0].filename); - if (allow[0].rules) { - LM_DBG("default allow file (%s) parsed\n", allow[0].filename); - } else { - LM_INFO("default allow file (%s) not found => empty rule set\n", - allow[0].filename); + if(permissions_init_rpc()!=0) { + LM_ERR("failed to register RPC commands\n"); + return -1; } - deny[0].filename = get_pathname(default_deny_file); - deny[0].rules = parse_config_file(deny[0].filename); - if (deny[0].rules) { - LM_DBG("default deny file (%s) parsed\n", deny[0].filename); + if(_perm_load_backends&PERM_LOAD_ALLOWFILE) { + allow[0].filename = get_pathname(default_allow_file); + allow[0].rules = parse_config_file(allow[0].filename); + if (allow[0].rules) { + LM_DBG("default allow file (%s) parsed\n", allow[0].filename); + } else { + LM_INFO("default allow file (%s) not found => empty rule set\n", + allow[0].filename); + } } else { - LM_INFO("default deny file (%s) not found => empty rule set\n", - deny[0].filename); + allow[0].filename = NULL; + allow[0].rules = NULL; } - if (init_trusted() != 0) { - LM_ERR("failed to initialize the allow_trusted function\n"); - return -1; + if(_perm_load_backends&PERM_LOAD_DENYFILE) { + deny[0].filename = get_pathname(default_deny_file); + deny[0].rules = parse_config_file(deny[0].filename); + if (deny[0].rules) { + LM_DBG("default deny file (%s) parsed\n", deny[0].filename); + } else { + LM_INFO("default deny file (%s) not found => empty rule set\n", + deny[0].filename); + } + } else { + deny[0].filename = NULL; + deny[0].rules = NULL; } if (init_tag_avp(&tag_avp_param) < 0) { @@ -610,9 +622,18 @@ static int mod_init(void) return -1; } - if (init_addresses() != 0) { - LM_ERR("failed to initialize the allow_address function\n"); - return -1; + if(_perm_load_backends&PERM_LOAD_TRUSTEDDB) { + if (init_trusted() != 0) { + LM_ERR("failed to initialize the allow_trusted function\n"); + return -1; + } + } + + if(_perm_load_backends&PERM_LOAD_ADDRESSDB) { + if (init_addresses() != 0) { + LM_ERR("failed to initialize the allow_address function\n"); + return -1; + } } if ((db_mode != DISABLE_CACHE) && (db_mode != ENABLE_CACHE)) { diff --git a/src/modules/permissions/permissions.h b/src/modules/permissions/permissions.h index 1613652ee6..bec8a7c236 100644 --- a/src/modules/permissions/permissions.h +++ b/src/modules/permissions/permissions.h @@ -60,6 +60,12 @@ extern str mask_col; /* Name of mask column */ extern str port_col; /* Name of port column */ extern int peer_tag_mode; /* Matching mode */ +/* backends to be loaded */ +#define PERM_LOAD_ADDRESSDB (1<<0) +#define PERM_LOAD_TRUSTEDDB (1<<1) +#define PERM_LOAD_ALLOWFILE (1<<2) +#define PERM_LOAD_DENYFILE (1<<3) +extern int _perm_load_backends; /* */ typedef struct int_or_pvar { unsigned int i;

2 1

git:master:e703b10c: keepalive: removed duplicated typedef definition
by Daniel-Constantin Mierla 29 Jun '17

29 Jun '17

Module: kamailio Branch: master Commit: e703b10cab467a0bd2a147fe63177a29310ece81 URL: https://github.com/kamailio/kamailio/commit/e703b10cab467a0bd2a147fe63177a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-29T09:33:47+02:00 keepalive: removed duplicated typedef definition --- Modified: src/modules/keepalive/api.h --- Diff: https://github.com/kamailio/kamailio/commit/e703b10cab467a0bd2a147fe63177a2… Patch: https://github.com/kamailio/kamailio/commit/e703b10cab467a0bd2a147fe63177a2… --- diff --git a/src/modules/keepalive/api.h b/src/modules/keepalive/api.h index 020989b4ce..33b7db135b 100644 --- a/src/modules/keepalive/api.h +++ b/src/modules/keepalive/api.h @@ -29,6 +29,7 @@ #define __KEEPALIVE_API_H_ #include "../../core/sr_module.h" +#include "keepalive.h" typedef int ka_state; @@ -36,7 +37,6 @@ typedef int ka_state; #define KA_STATE_UP 1 #define KA_STATE_DOWN 2 -typedef void (*ka_statechanged_f)(str *uri, int state, void *user_attr); typedef int (*ka_add_dest_f)(str *uri, str *owner, int flags, ka_statechanged_f callback, void *user_attr); typedef ka_state (*ka_dest_state_f)(str *uri); @@ -70,4 +70,4 @@ static inline int keepalive_load_api(keepalive_api_t *api) return 0; } -#endif /* __KEEPALIVE_API_H__ */ \ No newline at end of file +#endif /* __KEEPALIVE_API_H__ */

1 0

git:master:6ad1744f: modules: readme files regenerated - permissions ... [skip ci]
by Kamailio Dev 29 Jun '17

29 Jun '17

Module: kamailio Branch: master Commit: 6ad1744f13d8ceda7463024e6df37a7d229bc4cc URL: https://github.com/kamailio/kamailio/commit/6ad1744f13d8ceda7463024e6df37a7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-29T09:31:37+02:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/6ad1744f13d8ceda7463024e6df37a7… Patch: https://github.com/kamailio/kamailio/commit/6ad1744f13d8ceda7463024e6df37a7…

1 0

git:master:64c529d1: permissions: documented load_backends parameter
by Daniel-Constantin Mierla 29 Jun '17

29 Jun '17

Module: kamailio Branch: master Commit: 64c529d15262921bed26f7f4b15af043382bba36 URL: https://github.com/kamailio/kamailio/commit/64c529d15262921bed26f7f4b15af04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-29T09:27:33+02:00 permissions: documented load_backends parameter --- Modified: src/modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/64c529d15262921bed26f7f4b15af04… Patch: https://github.com/kamailio/kamailio/commit/64c529d15262921bed26f7f4b15af04… --- diff --git a/src/modules/permissions/doc/permissions_admin.xml b/src/modules/permissions/doc/permissions_admin.xml index 6579b7dfb1..315a70c832 100644 --- a/src/modules/permissions/doc/permissions_admin.xml +++ b/src/modules/permissions/doc/permissions_admin.xml @@ -792,6 +792,30 @@ modparam("permissions", "max_subnets", 1024) </programlisting> </example> </section> + <section id ="permissions.p.load_backends"> + <title><varname>load_backends</varname> (int)</title> + <para> + Control what backends should be loaded: 1 - address table; + 2 - trusted table; 4 - allow file; 8 - deny file. + </para> + <para> + It can be a combination (sum) of the options to load many backends + (e.g., 3 - loads address and trusted tables). + </para> + <para> + <emphasis> + Default value is <quote>0xffff</quote> (load all backends). + </emphasis> + </para> + <example> + <title>Set <varname>load_backends</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("permissions", "load_backends", 1) +... +</programlisting> + </example> + </section> </section> <section>

1 0

[kamailio/kamailio] radius : Fixes use of freeradiusclient library (#1170)
by Yasin CANER 29 Jun '17

29 Jun '17

Fixes use of freeradiusclient library for radius modules. Setting right path. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1170 -- Commit Summary -- * radius : Fixes freeradiusclient library -- File Changes -- M src/modules/misc_radius/radius.h (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1170.patch https://github.com/kamailio/kamailio/pull/1170.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1170

3 10

[kamailio/kamailio] jansson: can't extract values from string-only json array (#1171)
by Sebastian Damm 29 Jun '17

29 Jun '17

### Description I have a json string stored in a variable, and I want to iterate over the values in it. This works if there are integer values in the json string. But if it consists only of string values, jansson_get throws an error. According to jsonlint, all my json strings are valid. ### Troubleshooting #### Reproduction This is the part of kamailio.cfg leading to the error: ``` # Integer json array $var(myIntList) = '[2,3,4,5]'; xlog("L_INFO", "Integer json string is >>>> $var(myIntList) <<<<"); jansson_get('[0]', $var(myIntList), "$var(intValue)"); xlog("L_INFO", "First Int Element: >> $var(intValue) <<"); jansson_get('[1]', $var(myIntList), "$var(intValue)"); xlog("L_INFO", "Second Int Element: >> $var(intValue) <<"); # String json array $var(myStringList) = '["foo", "bar", "baz"]'; xlog("L_INFO", "String json string is >>>> $var(myStringList) <<<<"); jansson_get('[0]', $var(myStrList), "$var(strValue)"); xlog("L_INFO", "First Str Element: >> $var(strValue) <<"); jansson_get('[1]', $var(myStrList), "$var(strValue)"); xlog("L_INFO", "Second Str Element: >> $var(strValue) <<"); # Mixed json array $var(myMixedList) = '[2, "bar"]'; xlog("L_INFO", "Mixed json string (int first) is >>>> $var(myMixedList) <<<<"); jansson_get('[0]', $var(myMixedList), "$var(mixedValue)"); xlog("L_INFO", "First Mixed Element: >> $var(mixedValue) <<"); jansson_get('[1]', $var(myMixedList), "$var(mixedValue)"); xlog("L_INFO", "Second Mixed Element: >> $var(mixedValue) <<"); $var(myMixedList) = '["bar", 2]'; xlog("L_INFO", "Mixed json string (string first) is >>>> $var(myMixedList) <<<<"); jansson_get('[0]', $var(myMixedList), "$var(mixedValue)"); xlog("L_INFO", "First Mixed Element: >> $var(mixedValue) <<"); jansson_get('[1]', $var(myMixedList), "$var(mixedValue)"); xlog("L_INFO", "Second Mixed Element: >> $var(mixedValue) <<"); ``` #### Log Messages This is the output generated by the above kamailio.cfg snippet. ``` Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Integer json string is >>>> [2,3,4,5] <<<< Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: First Int Element: >> 2 << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Second Int Element: >> 3 << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: String json string is >>>> ["foo", "bar", "baz"] <<<< Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: ERROR: jansson [jansson_funcs.c:59]: janssonmod_get(): failed to parse: 0 Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: ERROR: jansson [jansson_funcs.c:61]: janssonmod_get(): json error at line 1: '[' or '{' expected near '0' Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: First Str Element: >> 0 << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: ERROR: jansson [jansson_funcs.c:59]: janssonmod_get(): failed to parse: 0 Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: ERROR: jansson [jansson_funcs.c:61]: janssonmod_get(): json error at line 1: '[' or '{' expected near '0' Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Second Str Element: >> 0 << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Mixed json string (int first) is >>>> [2, "bar"] <<<< Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: First Mixed Element: >> 2 << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Second Mixed Element: >> bar << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Mixed json string (string first) is >>>> ["bar", 2] <<<< Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: First Mixed Element: >> bar << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Second Mixed Element: >> 2 << ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.9.2 ``` * **Operating System**: Debian Jessie ``` Linux busch.domain 3.16.0-4-amd64 #1 SMP Debian 3.16.39-1+deb8u1 (2017-02-22) x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1171

2 3

Re: [sr-dev] [kamailio/kamailio] kamctl: added DBPORT option (18e3327)
by Joseph F. Berghof III 28 Jun '17

28 Jun '17

When DBENGINE=PGSQL and DBPORT is set in kamctlrc the DBHOST is used instead of DBPORT (typo in utils/kamctl/kamdbctl.pgsql lines 58-59) when issuing the 'psql' command. This introduces a bug that appears to be fixed in the master branch. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/18e3327bedc1647a5abe0d377b15b74…

1 0

[kamailio/kamailio] resolve an issue found by cppcheck (#1169)
by Ilya Shipitsin 28 Jun '17

28 Jun '17

[utils/db_berkeley/kambdb_recover.c:339] -> [utils/db_berkeley/kambdb_recover.c:341]: (warning) Either the condition '!tbc' is redundant or there is possible null pointer dereference: tbc. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1169 -- Commit Summary -- * resolve an issue found by cppcheck: -- File Changes -- M utils/db_berkeley/kambdb_recover.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1169.patch https://github.com/kamailio/kamailio/pull/1169.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1169

3 7

git:master:5e8f84e9: .github: added pull request template
by Daniel-Constantin Mierla 28 Jun '17

28 Jun '17

Module: kamailio Branch: master Commit: 5e8f84e9c7d3ef792ea8b0520087ae3e933fda39 URL: https://github.com/kamailio/kamailio/commit/5e8f84e9c7d3ef792ea8b0520087ae3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-28T17:22:34+02:00 .github: added pull request template --- Added: .github/PULL_REQUEST_TEMPLATE.md --- Diff: https://github.com/kamailio/kamailio/commit/5e8f84e9c7d3ef792ea8b0520087ae3… Patch: https://github.com/kamailio/kamailio/commit/5e8f84e9c7d3ef792ea8b0520087ae3… --- diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..2ce2261892 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,37 @@ + + + + +#### Pre-Submission Checklist + + + +- [ ] Commit message has the format required by CONTRIBUTING guide +- [ ] Commits are split per component (core, individual modules, libs, utils, ...) +- [ ] Each component has a single commit (if not, squash them into one commit) +- [ ] No commits to README files for modules (changes must be done to docbook files +in `doc/` subfolder, the README file is autogenerated) + +#### Type Of Change +- [ ] Small bug fix (non-breaking change which fixes an issue) +- [ ] New feature (non-breaking change which adds new functionality) +- [ ] Breaking change (fix or feature that would change existing functionality) + +#### Checklist: + +- [ ] PR should be backported to stable branches +- [ ] Tested changes locally +- [ ] Related to issue #XXXX (replace XXXX with an open issue number) + +#### Description +

1 0

git:master:bbe03709: utils/db_berkeley: access variable after null pointer check
by Daniel-Constantin Mierla 28 Jun '17

28 Jun '17

Module: kamailio Branch: master Commit: bbe0370939ff8a14e931595389b6678817ff1056 URL: https://github.com/kamailio/kamailio/commit/bbe0370939ff8a14e931595389b6678… Author: Ilya Shipitsin <chipitsine(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-28T16:45:54+02:00 utils/db_berkeley: access variable after null pointer check --- Modified: utils/db_berkeley/kambdb_recover.c --- Diff: https://github.com/kamailio/kamailio/commit/bbe0370939ff8a14e931595389b6678… Patch: https://github.com/kamailio/kamailio/commit/bbe0370939ff8a14e931595389b6678… --- diff --git a/utils/db_berkeley/kambdb_recover.c b/utils/db_berkeley/kambdb_recover.c index 891cf2cfdc..30733a01ff 100644 --- a/utils/db_berkeley/kambdb_recover.c +++ b/utils/db_berkeley/kambdb_recover.c @@ -336,14 +336,14 @@ int recover(char* jfn) return 2; } - tp = tbc->dtp; - - if(!tbc || !tp) + if(!tbc || !tbc->dtp) { fprintf(stderr, "[recover]: FAILED to get find metadata for : %s.\n", tn); fclose(fp); return 3; } + + tp = tbc->dtp; while ( fgets(line , MAX_ROW_SIZE, fp) != NULL ) {

1 0

git:5.0:2ccf97c2: kazoo: add json.count transformation
by Luis Azedo 28 Jun '17

28 Jun '17

Module: kamailio Branch: 5.0 Commit: 2ccf97c2932dcd5242f7997c3230427dfe6b4417 URL: https://github.com/kamailio/kamailio/commit/2ccf97c2932dcd5242f7997c3230427… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-28T12:11:42+01:00 kazoo: add json.count transformation (cherry picked from commit 551413f0952429c3a360b5ccdeaeac48ea15ff8a) --- Modified: src/modules/kazoo/kz_json.c Modified: src/modules/kazoo/kz_json.h Modified: src/modules/kazoo/kz_trans.c Modified: src/modules/kazoo/kz_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/2ccf97c2932dcd5242f7997c3230427… Patch: https://github.com/kamailio/kamailio/commit/2ccf97c2932dcd5242f7997c3230427…

1 0

git:5.0:d5d15e6c: kazoo: add $kzRK to accdess routing key of the payload
by Luis Azedo 28 Jun '17

28 Jun '17

Module: kamailio Branch: 5.0 Commit: d5d15e6c9f67e5a64bb5c3ec6926b39dc8e3b779 URL: https://github.com/kamailio/kamailio/commit/d5d15e6c9f67e5a64bb5c3ec6926b39… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-28T12:11:20+01:00 kazoo: add $kzRK to accdess routing key of the payload (cherry picked from commit d5c602454a9af6ebce852f44dc88c4efa4bf036f) --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/d5d15e6c9f67e5a64bb5c3ec6926b39… Patch: https://github.com/kamailio/kamailio/commit/d5d15e6c9f67e5a64bb5c3ec6926b39…

1 0

git:5.0:3c6e9e02: kazoo: use hardcoded max size of routing key
by Luis Azedo 28 Jun '17

28 Jun '17

Module: kamailio Branch: 5.0 Commit: 3c6e9e02d124ceb1227c8481042ac221ff79bd8d URL: https://github.com/kamailio/kamailio/commit/3c6e9e02d124ceb1227c8481042ac22… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-28T12:10:52+01:00 kazoo: use hardcoded max size of routing key (cherry picked from commit f18da4c9d6cc8d1ab061d68cbd8e9d988ebf2be6) --- Modified: src/modules/kazoo/defs.h Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/3c6e9e02d124ceb1227c8481042ac22… Patch: https://github.com/kamailio/kamailio/commit/3c6e9e02d124ceb1227c8481042ac22…

1 0

git:5.0:e3f69bf1: kazoo: max size of routing key
by Luis Azedo 28 Jun '17

28 Jun '17

Module: kamailio Branch: 5.0 Commit: e3f69bf10c09c9817d3839bc58e2f17f8dbeaded URL: https://github.com/kamailio/kamailio/commit/e3f69bf10c09c9817d3839bc58e2f17… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-28T12:10:33+01:00 kazoo: max size of routing key (cherry picked from commit 56e07cf2bb281d0aa78517e919055de640468020) --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/e3f69bf10c09c9817d3839bc58e2f17… Patch: https://github.com/kamailio/kamailio/commit/e3f69bf10c09c9817d3839bc58e2f17…

1 0

[kamailio/kamailio] tls compiler warnings (#1075)
by juha-h 28 Jun '17

28 Jun '17

These warnings should be eliminated in order to make compilation readable: CC (gcc) [M tls.so] tls_locking.o tls_locking.c:98:13: warning: 'locking_f' defined but not used [-Wunused-function] static void locking_f(int mode, int n, const char* file, int line) ^~~~~~~~~ tls_locking.c:83:13: warning: 'dyn_destroy_f' defined but not used [-Wunused-function] static void dyn_destroy_f(struct CRYPTO_dynlock_value *l, ^~~~~~~~~~~~~ tls_locking.c:65:13: warning: 'dyn_lock_f' defined but not used [-Wunused-function] static void dyn_lock_f(int mode, struct CRYPTO_dynlock_value* l, ^~~~~~~~~~ tls_locking.c:42:37: warning: 'dyn_create_f' defined but not used [-Wunused-function] static struct CRYPTO_dynlock_value* dyn_create_f(const char* file, int line) ^~~~~~~~~~~~ CC (gcc) [M tls.so] tls_init.o tls_init.c: In function 'init_ssl_methods': tls_init.c:377:2: warning: 'TLSv1_client_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_cli - 1] = TLSv1_client_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1598:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_client_method(void)) /* TLSv1.0 */ ^ tls_init.c:378:2: warning: 'TLSv1_server_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_srv - 1] = TLSv1_server_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1597:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_server_method(void)) /* TLSv1.0 */ ^ tls_init.c:379:2: warning: 'TLSv1_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1 - 1] = TLSv1_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1596:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_method(void)) /* TLSv1.0 */ ^ tls_init.c:382:2: warning: 'TLSv1_1_client_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_1_cli - 1] = TLSv1_1_client_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1604:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_client_method(void)) /* TLSv1.1 */ ^ tls_init.c:383:2: warning: 'TLSv1_1_server_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_1_srv - 1] = TLSv1_1_server_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1603:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_server_method(void)) /* TLSv1.1 */ ^ tls_init.c:384:2: warning: 'TLSv1_1_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_1 - 1] = TLSv1_1_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1602:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_method(void)) /* TLSv1.1 */ ^ tls_init.c:388:2: warning: 'TLSv1_2_client_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_2_cli - 1] = TLSv1_2_client_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1610:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_client_method(void)) /* TLSv1.2 */ ^ tls_init.c:389:2: warning: 'TLSv1_2_server_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_2_srv - 1] = TLSv1_2_server_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1609:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_server_method(void)) /* TLSv1.2 */ ^ tls_init.c:390:2: warning: 'TLSv1_2_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_2 - 1] = TLSv1_2_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1608:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_method(void)) /* TLSv1.2 */ ^ -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1075

2 2

git:master:76efc9b7: tls: updated tls version selection for libssl 1.1.0 api
by Daniel-Constantin Mierla 28 Jun '17

28 Jun '17

Module: kamailio Branch: master Commit: 76efc9b7a1489007f9ff431e730ce4e86b446a6c URL: https://github.com/kamailio/kamailio/commit/76efc9b7a1489007f9ff431e730ce4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-28T11:41:15+02:00 tls: updated tls version selection for libssl 1.1.0 api - fixes compile warnings for deprecated TLSXY_method() functions --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_domain.h Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_init.h --- Diff: https://github.com/kamailio/kamailio/commit/76efc9b7a1489007f9ff431e730ce4e… Patch: https://github.com/kamailio/kamailio/commit/76efc9b7a1489007f9ff431e730ce4e…

1 0

git:master:e7c03ce6: tls: dynamic locks not needed for openssl v1.1.0+
by Daniel-Constantin Mierla 28 Jun '17

28 Jun '17

Module: kamailio Branch: master Commit: e7c03ce6ce61119fbf5cb9f41b7abcd4c7138d58 URL: https://github.com/kamailio/kamailio/commit/e7c03ce6ce61119fbf5cb9f41b7abcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-28T10:26:43+02:00 tls: dynamic locks not needed for openssl v1.1.0+ - openssl v1.1.0 is thread safe - fixes the compile warnings for libssl 1.1.0 --- Modified: src/modules/tls/tls_locking.c --- Diff: https://github.com/kamailio/kamailio/commit/e7c03ce6ce61119fbf5cb9f41b7abcd… Patch: https://github.com/kamailio/kamailio/commit/e7c03ce6ce61119fbf5cb9f41b7abcd… --- diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c index 9d8e8acec5..38c028fd2f 100644 --- a/src/modules/tls/tls_locking.c +++ b/src/modules/tls/tls_locking.c @@ -32,6 +32,9 @@ static int n_static_locks=0; static gen_lock_set_t* static_locks=0; +/* OpenSSL is thread-safe since 1.1.0 */ +#if OPENSSL_VERSION_NUMBER < 0x10100000L + /* "dynamic" locks */ struct CRYPTO_dynlock_value{ @@ -61,7 +64,6 @@ static struct CRYPTO_dynlock_value* dyn_create_f(const char* file, int line) } - static void dyn_lock_f(int mode, struct CRYPTO_dynlock_value* l, const char* file, int line) { @@ -116,6 +118,7 @@ static void locking_f(int mode, int n, const char* file, int line) } } +#endif /* openssl < 0x10100000L (1.1.0) */ void tls_destroy_locks() @@ -163,10 +166,14 @@ int tls_init_locks() } CRYPTO_set_locking_callback(locking_f); } + +/* OpenSSL is thread-safe since 1.1.0 */ +#if OPENSSL_VERSION_NUMBER < 0x10100000L /* set "dynamic" locks callbacks */ CRYPTO_set_dynlock_create_callback(dyn_create_f); CRYPTO_set_dynlock_lock_callback(dyn_lock_f); CRYPTO_set_dynlock_destroy_callback(dyn_destroy_f); +#endif /* starting with v1.0.0 openssl does not use anymore getpid(), but address * of errno which can point to same virtual address in a multi-process

1 0

git:master:551413f0: kazoo: add json.count transformation
by lazedo 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 551413f0952429c3a360b5ccdeaeac48ea15ff8a URL: https://github.com/kamailio/kamailio/commit/551413f0952429c3a360b5ccdeaeac4… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-06-27T23:01:37+01:00 kazoo: add json.count transformation --- Modified: src/modules/kazoo/kz_json.c Modified: src/modules/kazoo/kz_json.h Modified: src/modules/kazoo/kz_trans.c Modified: src/modules/kazoo/kz_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/551413f0952429c3a360b5ccdeaeac4… Patch: https://github.com/kamailio/kamailio/commit/551413f0952429c3a360b5ccdeaeac4…

1 0

git:master:d5c60245: kazoo: add $kzRK to accdess routing key of the payload
by lazedo 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: d5c602454a9af6ebce852f44dc88c4efa4bf036f URL: https://github.com/kamailio/kamailio/commit/d5c602454a9af6ebce852f44dc88c4e… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-06-27T23:00:43+01:00 kazoo: add $kzRK to accdess routing key of the payload --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/d5c602454a9af6ebce852f44dc88c4e… Patch: https://github.com/kamailio/kamailio/commit/d5c602454a9af6ebce852f44dc88c4e…

1 0

[kamailio/kamailio] dispatcher: runtime status access from script (#1166)
by lazedo 27 Jun '17

27 Jun '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1166 -- Commit Summary -- * dispatcher: runtime status access from script -- File Changes -- M src/modules/dispatcher/dispatch.c (94) M src/modules/dispatcher/dispatch.h (4) M src/modules/dispatcher/dispatcher.c (139) M src/modules/dispatcher/doc/dispatcher_admin.xml (98) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1166.patch https://github.com/kamailio/kamailio/pull/1166.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1166

2 5

git:master:a1d64dea: modules: readme files regenerated - path ... [skip ci]
by Kamailio Dev 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: a1d64dea035c1b54c285c4d2d16add414db46795 URL: https://github.com/kamailio/kamailio/commit/a1d64dea035c1b54c285c4d2d16add4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-27T16:46:21+02:00 modules: readme files regenerated - path ... [skip ci] --- Modified: src/modules/path/README --- Diff: https://github.com/kamailio/kamailio/commit/a1d64dea035c1b54c285c4d2d16add4… Patch: https://github.com/kamailio/kamailio/commit/a1d64dea035c1b54c285c4d2d16add4… --- diff --git a/src/modules/path/README b/src/modules/path/README index d3e88f878e..d2e3d69398 100644 --- a/src/modules/path/README +++ b/src/modules/path/README @@ -49,7 +49,7 @@ Richard Fuchs 1.1. Add Supported header 1.2. Set use_received parameter 1.3. Set received_format parameter - 1.4. Set use_received parameter + 1.4. Set enable_r2 parameter 1.5. add_path usage 1.6. add_path(user) usage 1.7. add_path(user, parameters) usage @@ -208,9 +208,9 @@ modparam("path", "received_format", 1) Default value is 0. - Example 1.4. Set use_received parameter + Example 1.4. Set enable_r2 parameter ... -modparam("path", "use_received", 1) +modparam("path", "enable_r2", 1) ... 4. Functions

1 0

git:master:43f91aa7: path: fixed the name of the parameter in enable_r2 example
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 43f91aa76fd293eb08442a710baa8cb63146e067 URL: https://github.com/kamailio/kamailio/commit/43f91aa76fd293eb08442a710baa8cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T16:43:38+02:00 path: fixed the name of the parameter in enable_r2 example --- Modified: src/modules/path/doc/path_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/43f91aa76fd293eb08442a710baa8cb… Patch: https://github.com/kamailio/kamailio/commit/43f91aa76fd293eb08442a710baa8cb… --- diff --git a/src/modules/path/doc/path_admin.xml b/src/modules/path/doc/path_admin.xml index 4712a09716..a623e55d95 100644 --- a/src/modules/path/doc/path_admin.xml +++ b/src/modules/path/doc/path_admin.xml @@ -192,10 +192,10 @@ modparam("path", "received_format", 1) </emphasis> </para> <example> - <title>Set <varname>use_received</varname> parameter</title> + <title>Set <varname>enable_r2</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("path", "use_received", 1) +modparam("path", "enable_r2", 1) ... </programlisting> </example>

1 0

git:master:7fc44593: modules: readme files regenerated - path ... [skip ci]
by Kamailio Dev 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 7fc44593b6e2f7b554de7aa2acc9037b6da045e6 URL: https://github.com/kamailio/kamailio/commit/7fc44593b6e2f7b554de7aa2acc9037… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-27T16:31:28+02:00 modules: readme files regenerated - path ... [skip ci] --- Modified: src/modules/path/README Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/7fc44593b6e2f7b554de7aa2acc9037… Patch: https://github.com/kamailio/kamailio/commit/7fc44593b6e2f7b554de7aa2acc9037…

1 0

git:master:e1df9208: pv: new variables - $RAu and $RAut
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: e1df92080a631b8c97c110d1e87f74fa1cd5ec9e URL: https://github.com/kamailio/kamailio/commit/e1df92080a631b8c97c110d1e87f74f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T16:15:43+02:00 pv: new variables - $RAu and $RAut - $RAu - URI format for local socket where the SIP message was received, without trasport parameter for UDP, using the advertised address if available - $RAut - URI format for local socket where the SIP message was received, always with transport parameter, using the advertised address if available --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/e1df92080a631b8c97c110d1e87f74f… Patch: https://github.com/kamailio/kamailio/commit/e1df92080a631b8c97c110d1e87f74f… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 4e4eddfecf..c85d2015eb 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -387,6 +387,12 @@ static pv_export_t mod_pvs[] = { {{"RAp", (sizeof("RAp")-1)}, /* */ PVT_OTHER, pv_get_rcv_advertised_port, 0, 0, 0, 0, 0}, + {{"RAu", (sizeof("RAu")-1)}, /* */ + PVT_OTHER, pv_get_rcvadv_uri, 0, + 0, 0, 0, 0}, + {{"RAut", (sizeof("RAut")-1)}, /* */ + PVT_OTHER, pv_get_rcvadv_uri_full, 0, + 0, 0, 0, 0}, {{"sf", (sizeof("sf")-1)}, /* */ PVT_OTHER, pv_get_sflags, pv_set_sflags, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index b49de912d7..34b03a411f 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -760,7 +760,7 @@ int pv_get_rcvaddr_uri_helper(struct sip_msg *msg, pv_param_t *param, if(msg==NULL) return -1; - if(get_rcv_socket_uri(msg, tmode, &uri)<0) + if(get_rcv_socket_uri(msg, tmode, &uri, 0)<0) return pv_get_null(msg, param, res); if (uri.len + 1 >= pv_get_buffer_size()) @@ -820,6 +820,62 @@ int pv_get_rcv_advertised_port(struct sip_msg *msg, pv_param_t *param, return pv_get_rcvport(msg, param, res); } +int pv_get_rcvadv_uri_helper(struct sip_msg *msg, pv_param_t *param, + int tmode, pv_value_t *res) +{ + str uri; + str sr; + + if(msg==NULL) + return -1; + + if(get_rcv_socket_uri(msg, tmode, &uri, 1)<0) + return pv_get_null(msg, param, res); + + if (uri.len + 1 >= pv_get_buffer_size()) + { + LM_ERR("local buffer size exceeded\n"); + return pv_get_null(msg, param, res); + } + + sr.s = pv_get_buffer(); + strncpy(sr.s, uri.s, uri.len); + sr.len = uri.len; + sr.s[sr.len] = '\0'; + + return pv_get_strval(msg, param, res, &sr); +} + +int pv_get_rcvadv_uri(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address!=NULL + && (msg->rcv.bind_address->useinfo.address_str.len > 0 + || msg->rcv.bind_address->useinfo.port_no_str.len > 0)) { + return pv_get_rcvadv_uri_helper(msg, param, 0, res); + } + + return pv_get_rcvaddr_uri_helper(msg, param, 0, res); +} + +int pv_get_rcvadv_uri_full(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address!=NULL + && (msg->rcv.bind_address->useinfo.address_str.len > 0 + || msg->rcv.bind_address->useinfo.port_no_str.len > 0)) { + return pv_get_rcvadv_uri_helper(msg, param, 1, res); + } + + return pv_get_rcvaddr_uri_helper(msg, param, 1, res); +} + /** * */ diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 81c86f02a8..ac36ef315a 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -157,6 +157,12 @@ int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, int pv_get_rcv_advertised_port(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_rcvadv_uri(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + +int pv_get_rcvadv_uri_full(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_force_sock(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:aa9129b7: core: parser - get_rcv_socket_uri() with option to use advertised address
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: aa9129b71bb009176571a8cb5bde7221b2f92b75 URL: https://github.com/kamailio/kamailio/commit/aa9129b71bb009176571a8cb5bde722… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T16:14:52+02:00 core: parser - get_rcv_socket_uri() with option to use advertised address --- Modified: src/core/parser/msg_parser.c Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/aa9129b71bb009176571a8cb5bde722… Patch: https://github.com/kamailio/kamailio/commit/aa9129b71bb009176571a8cb5bde722… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 84a7ba6ff5..be137652de 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -1105,8 +1105,9 @@ int get_src_uri(sip_msg_t *m, int tmode, str *uri) /** * get received-on-socket ip, port and protocol in SIP URI format * - tmode - 0: short format (transport=udp is not added, being default) + * - atype - 0: listen address; 1: advertised address */ -int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri) +int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype) { static char buf[MAX_URI_SIZE]; char* p; @@ -1139,11 +1140,21 @@ int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri) } } - ip.s = m->rcv.bind_address->address_str.s; - ip.len = m->rcv.bind_address->address_str.len; + if(atype==0 || m->rcv.bind_address->useinfo.address_str.len<=0) { + ip.s = m->rcv.bind_address->address_str.s; + ip.len = m->rcv.bind_address->address_str.len; + } else { + ip.s = m->rcv.bind_address->useinfo.address_str.s; + ip.len = m->rcv.bind_address->useinfo.address_str.len; + } - port.s = m->rcv.bind_address->port_no_str.s; - port.len = m->rcv.bind_address->port_no_str.len; + if(atype==0|| m->rcv.bind_address->useinfo.port_no_str.len <= 0) { + port.s = m->rcv.bind_address->port_no_str.s; + port.len = m->rcv.bind_address->port_no_str.len; + } else { + port.s = m->rcv.bind_address->useinfo.port_no_str.s; + port.len = m->rcv.bind_address->useinfo.port_no_str.len; + } len = 4 + ip.len + 2*(m->rcv.src_ip.af==AF_INET6)+ 1 + port.len; if (proto.s) { diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index dd5f498a12..41e6deeb33 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -501,6 +501,6 @@ int get_src_uri(sip_msg_t *m, int tmode, str *uri); /** * get received-on-socket ip, port and protocol in SIP URI format */ -int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri); +int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype); #endif

1 0

git:master:55b5b354: pv: $RAp returns also the int value for advertised port when available
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 55b5b35430ccb7de904f6b1c48ff71e691344b9e URL: https://github.com/kamailio/kamailio/commit/55b5b35430ccb7de904f6b1c48ff71e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T16:00:08+02:00 pv: $RAp returns also the int value for advertised port when available --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/55b5b35430ccb7de904f6b1c48ff71e… Patch: https://github.com/kamailio/kamailio/commit/55b5b35430ccb7de904f6b1c48ff71e… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 8e0074fca4..b49de912d7 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -797,7 +797,8 @@ int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, if(msg->rcv.bind_address!=NULL && msg->rcv.bind_address->useinfo.address_str.len > 0) { - return pv_get_strval(msg, param, res, &msg->rcv.bind_address->useinfo.address_str); + return pv_get_strval(msg, param, res, + &msg->rcv.bind_address->useinfo.address_str); } return pv_get_rcvip(msg, param, res); @@ -811,7 +812,9 @@ int pv_get_rcv_advertised_port(struct sip_msg *msg, pv_param_t *param, if(msg->rcv.bind_address!=NULL && msg->rcv.bind_address->useinfo.port_no_str.len > 0) { - return pv_get_strval(msg, param, res, &msg->rcv.bind_address->useinfo.port_no_str); + return pv_get_intstrval(msg, param, res, + (int)msg->rcv.bind_address->useinfo.port_no, + &msg->rcv.bind_address->useinfo.port_no_str); } return pv_get_rcvport(msg, param, res);

1 0

git:master:adeab30b: pv: new variables - $Ru and $Rut
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: adeab30b6bd26b8c4eddd4eb070cb11417401521 URL: https://github.com/kamailio/kamailio/commit/adeab30b6bd26b8c4eddd4eb070cb11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:54:55+02:00 pv: new variables - $Ru and $Rut - $Ru - URI format for local socket where the SIP message was received, without trasport parameter for UDP - $Rut - URI format for local socket where the SIP message was received, always with transport parameter --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/adeab30b6bd26b8c4eddd4eb070cb11… Patch: https://github.com/kamailio/kamailio/commit/adeab30b6bd26b8c4eddd4eb070cb11… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 483faa2d19..4e4eddfecf 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -375,6 +375,12 @@ static pv_export_t mod_pvs[] = { {{"Rp", (sizeof("Rp")-1)}, /* */ PVT_OTHER, pv_get_rcvport, 0, 0, 0, 0, 0}, + {{"Ru", (sizeof("Ru")-1)}, /* */ + PVT_OTHER, pv_get_rcvaddr_uri, 0, + 0, 0, 0, 0}, + {{"Rut", (sizeof("Rut")-1)}, /* */ + PVT_OTHER, pv_get_rcvaddr_uri_full, 0, + 0, 0, 0, 0}, {{"RAi", (sizeof("RAi")-1)}, /* */ PVT_OTHER, pv_get_rcv_advertised_ip, 0, 0, 0, 0, 0}, @@ -408,12 +414,12 @@ static pv_export_t mod_pvs[] = { {{"su", (sizeof("su")-1)}, /* */ PVT_OTHER, pv_get_srcaddr_uri, 0, 0, 0, 0, 0}, - {{"td", (sizeof("td")-1)}, /* */ - PVT_OTHER, pv_get_to_attr, pv_set_to_domain, - 0, 0, pv_init_iname, 3}, {{"sut", (sizeof("sut")-1)}, /* */ PVT_OTHER, pv_get_srcaddr_uri_full, 0, 0, 0, 0, 0}, + {{"td", (sizeof("td")-1)}, /* */ + PVT_OTHER, pv_get_to_attr, pv_set_to_domain, + 0, 0, pv_init_iname, 3}, {{"to.domain", (sizeof("to.domain")-1)}, /* */ PVT_OTHER, pv_get_to_attr, pv_set_to_domain, 0, 0, pv_init_iname, 3}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index acd9105cb2..8e0074fca4 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -751,6 +751,44 @@ int pv_get_rcvport(struct sip_msg *msg, pv_param_t *param, &msg->rcv.bind_address->port_no_str); } +int pv_get_rcvaddr_uri_helper(struct sip_msg *msg, pv_param_t *param, + int tmode, pv_value_t *res) +{ + str uri; + str sr; + + if(msg==NULL) + return -1; + + if(get_rcv_socket_uri(msg, tmode, &uri)<0) + return pv_get_null(msg, param, res); + + if (uri.len + 1 >= pv_get_buffer_size()) + { + LM_ERR("local buffer size exceeded\n"); + return pv_get_null(msg, param, res); + } + + sr.s = pv_get_buffer(); + strncpy(sr.s, uri.s, uri.len); + sr.len = uri.len; + sr.s[sr.len] = '\0'; + + return pv_get_strval(msg, param, res, &sr); +} + +int pv_get_rcvaddr_uri(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + return pv_get_rcvaddr_uri_helper(msg, param, 0, res); +} + +int pv_get_rcvaddr_uri_full(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + return pv_get_rcvaddr_uri_helper(msg, param, 1, res); +} + int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 905fc89db5..81c86f02a8 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -145,6 +145,12 @@ int pv_get_rcvip(struct sip_msg *msg, pv_param_t *param, int pv_get_rcvport(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_rcvaddr_uri(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + +int pv_get_rcvaddr_uri_full(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:1984d4a0: core: parser - helper function to return URI format for local rcv socket
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 1984d4a063a175803b2852c14dcadd8839b4ad83 URL: https://github.com/kamailio/kamailio/commit/1984d4a063a175803b2852c14dcadd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:53:49+02:00 core: parser - helper function to return URI format for local rcv socket --- Modified: src/core/parser/msg_parser.c Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/1984d4a063a175803b2852c14dcadd8… Patch: https://github.com/kamailio/kamailio/commit/1984d4a063a175803b2852c14dcadd8… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 2a4f2bb593..84a7ba6ff5 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -1102,6 +1102,91 @@ int get_src_uri(sip_msg_t *m, int tmode, str *uri) return 0; } +/** + * get received-on-socket ip, port and protocol in SIP URI format + * - tmode - 0: short format (transport=udp is not added, being default) + */ +int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri) +{ + static char buf[MAX_URI_SIZE]; + char* p; + str ip, port; + int len; + str proto; + + if (!uri || !m || !m->rcv.bind_address) { + ERR("invalid parameter value\n"); + return -1; + } + + if(tmode==0) { + switch(m->rcv.proto) { + case PROTO_NONE: + case PROTO_UDP: + proto.s = 0; /* Do not add transport parameter, UDP is default */ + proto.len = 0; + break; + default: + if(get_valid_proto_string(m->rcv.proto, 1, 0, &proto)<0) { + ERR("unknown transport protocol\n"); + return -1; + } + } + } else { + if(get_valid_proto_string(m->rcv.proto, 1, 0, &proto)<0) { + ERR("unknown transport protocol\n"); + return -1; + } + } + + ip.s = m->rcv.bind_address->address_str.s; + ip.len = m->rcv.bind_address->address_str.len; + + port.s = m->rcv.bind_address->port_no_str.s; + port.len = m->rcv.bind_address->port_no_str.len; + + len = 4 + ip.len + 2*(m->rcv.src_ip.af==AF_INET6)+ 1 + port.len; + if (proto.s) { + len += TRANSPORT_PARAM_LEN; + len += proto.len; + } + + if (len > MAX_URI_SIZE) { + ERR("buffer too small\n"); + return -1; + } + + p = buf; + memcpy(p, "sip:", 4); + p += 4; + + if (m->rcv.src_ip.af==AF_INET6) + *p++ = '['; + memcpy(p, ip.s, ip.len); + p += ip.len; + if (m->rcv.src_ip.af==AF_INET6) + *p++ = ']'; + + *p++ = ':'; + + memcpy(p, port.s, port.len); + p += port.len; + + if (proto.s) { + memcpy(p, TRANSPORT_PARAM, TRANSPORT_PARAM_LEN); + p += TRANSPORT_PARAM_LEN; + + memcpy(p, proto.s, proto.len); + p += proto.len; + } + + uri->s = buf; + uri->len = len; + + return 0; +} + + /*! \brief returns a pointer to the begining of the msg's body */ char* get_body(sip_msg_t* const msg) diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 13a30d1570..dd5f498a12 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -498,4 +498,9 @@ void msg_ldata_reset(sip_msg_t*); */ int get_src_uri(sip_msg_t *m, int tmode, str *uri); +/** + * get received-on-socket ip, port and protocol in SIP URI format + */ +int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri); + #endif

1 0

git:master:a6d405b1: path: fix for second path insert pointer
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: a6d405b16ba745497ba9890c60541ffdb6cadeab URL: https://github.com/kamailio/kamailio/commit/a6d405b16ba745497ba9890c60541ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:53:20+02:00 path: fix for second path insert pointer --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/a6d405b16ba745497ba9890c60541ff… Patch: https://github.com/kamailio/kamailio/commit/a6d405b16ba745497ba9890c60541ff… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index ecfff280eb..274e6cfc7c 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -183,7 +183,7 @@ static int prepend_path(sip_msg_t* _m, str *user, path_param_t param, if (!l) goto out1; dp = path_strzdup(suffix, cp - suffix); if(dp==NULL) goto out1; - l = insert_new_lump_before(l, suffix, cp - suffix, 0); + l = insert_new_lump_before(l, dp, cp - suffix, 0); if (!l) goto out1; }

1 0

git:master:8f242cfb: path: documentation for enable_r2 and received_format parameters
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 8f242cfb151bbe4fdf4101f4bde59083307e6f8a URL: https://github.com/kamailio/kamailio/commit/8f242cfb151bbe4fdf4101f4bde5908… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:52:54+02:00 path: documentation for enable_r2 and received_format parameters --- Modified: src/modules/path/doc/path_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8f242cfb151bbe4fdf4101f4bde5908… Patch: https://github.com/kamailio/kamailio/commit/8f242cfb151bbe4fdf4101f4bde5908… --- diff --git a/src/modules/path/doc/path_admin.xml b/src/modules/path/doc/path_admin.xml index 31b8a572d9..4712a09716 100644 --- a/src/modules/path/doc/path_admin.xml +++ b/src/modules/path/doc/path_admin.xml @@ -143,6 +143,63 @@ modparam("path", "use_received", 1) </programlisting> </example> </section> + <section id="path.p.received_format"> + <title><varname>received_format</varname> (int)</title> + <para> + If set to 0, the <quote>received</quote> parameter value will be + in the escaped SIP URI format. + </para> + <para> + If set to 1, the <quote>received</quote> parameter value will be + in the same format as the <quote>alias</quote> parameter added by + set_contact_alias() from <quote>nathelper</quote> module (i.e., + <quote>ip~port~protid</quote>). This is a solution with some + SIP applications that incorrectly match the transport from + received parameter instead of the one from the SIP URI. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>received_format</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("path", "received_format", 1) +... +</programlisting> + </example> + </section> + <section id="path.p.enable_r2"> + <title><varname>enable_r2</varname> (int)</title> + <para> + If set to 1, the module will add two Path headers, similar to the + double Record-Route done by rr module. One Path headers corresponds + to incoming network socket and the other to outgoing network socket. + The URIs in the Path headers will have the 'r2=on' parameter as well. + </para> + <para> + Note: if enabled, the module adds the two Path headers even when the + incoming socket is the same as outgoing socket. Improvements to skip + the second Path header in this case may be introduced in the future, + meanwhile, if you need to enable this parameter but also deal with + same socket routing, use 'insert_hf("Path: <$Ru>\r\n")'. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>use_received</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("path", "use_received", 1) +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:master:e518e5e7: rr: small formatting adjustments to doc examples
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: e518e5e7a50be3510c896bd5f8a4cc38146631cc URL: https://github.com/kamailio/kamailio/commit/e518e5e7a50be3510c896bd5f8a4cc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:09:18+02:00 rr: small formatting adjustments to doc examples --- Modified: src/modules/rr/doc/rr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e518e5e7a50be3510c896bd5f8a4cc3… Patch: https://github.com/kamailio/kamailio/commit/e518e5e7a50be3510c896bd5f8a4cc3… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index 3e7138ce05..b64930a665 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -60,7 +60,7 @@ <title>Dialog support in RR module</title> <programlisting format="linespecific"> - +... UAC &kamailio; PROXY UAS ---- INVITE ------> record_route() ----- INVITE ----> @@ -74,7 +74,7 @@ UAC &kamailio; PROXY UAS <------ BYE ------- loose_route() <----- BYE ------- check_route_param(";foo=true") - +... </programlisting> </example> </section> @@ -264,7 +264,6 @@ modparam("rr", "custom_user_avp", "$avp(RR_CUSTOMER_USER_AVP)") #usage in cfg file $avp(RR_CUSTOM_USER_AVP)="mo"; record_route(); - ... </programlisting> </example>

1 0

git:master:2c62b317: path: option to add two path headers and use alias like received value
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 2c62b317065f36606cfb22822e65c00f129b4739 URL: https://github.com/kamailio/kamailio/commit/2c62b317065f36606cfb22822e65c00… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:04:31+02:00 path: option to add two path headers and use alias like received value - enable_r2 - add two path headers, one for incoming socket and one for outgoing socket - received_format - parameter to control if received value should be in sip uri (as so far) or in contact-alias param format --- Modified: src/modules/path/path.c Modified: src/modules/path/path.h Modified: src/modules/path/path_mod.c Modified: src/modules/path/path_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/2c62b317065f36606cfb22822e65c00… Patch: https://github.com/kamailio/kamailio/commit/2c62b317065f36606cfb22822e65c00…

1 0

git:master:9c9da879: core: remove inline from implementation of functions declared without it
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 9c9da87943ad86fd4ca3ba8b007cebfcb7d9bc61 URL: https://github.com/kamailio/kamailio/commit/9c9da87943ad86fd4ca3ba8b007cebf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:02:30+02:00 core: remove inline from implementation of functions declared without it --- Modified: src/core/parser/parse_uri.c Modified: src/core/parser/parse_uri.h --- Diff: https://github.com/kamailio/kamailio/commit/9c9da87943ad86fd4ca3ba8b007cebf… Patch: https://github.com/kamailio/kamailio/commit/9c9da87943ad86fd4ca3ba8b007cebf… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 71d56f55c9..0661ce4bfa 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -1305,7 +1305,7 @@ static inline int _parse_ruri(str *uri, if (*status) return 1; if (parse_uri(uri->s, uri->len, parsed_uri)<0) { - LOG(L_ERR, "ERROR: _parse_ruri: bad uri <%.*s>\n", + LOG(L_ERR, "ERROR: _parse_ruri: bad uri <%.*s>\n", uri->len, ZSW(uri->s)); *status=0; return -1; @@ -1347,7 +1347,8 @@ int parse_orig_ruri(struct sip_msg* msg) return ret; } -inline int normalize_tel_user(char* res, str* src) { +int normalize_tel_user(char* res, str* src) +{ int i, l; l=0; for (i=0; i<src->len; i++) { @@ -1360,7 +1361,7 @@ inline int normalize_tel_user(char* res, str* src) { default: res[l++]=src->s[i]; } - } + } return l; } @@ -1372,7 +1373,7 @@ str s_tels = STR_STATIC_INIT("tels"); str s_urn = STR_STATIC_INIT("urn"); static str s_null = STR_STATIC_INIT(""); -inline void uri_type_to_str(uri_type type, str *s) { +void uri_type_to_str(uri_type type, str *s) { switch (type) { case SIP_URI_T: *s = s_sip; @@ -1400,7 +1401,7 @@ static str s_tls = STR_STATIC_INIT("tls"); static str s_sctp = STR_STATIC_INIT("sctp"); static str s_ws = STR_STATIC_INIT("ws"); -inline void proto_type_to_str(unsigned short type, str *s) { +void proto_type_to_str(unsigned short type, str *s) { switch (type) { case PROTO_UDP: *s = s_udp; diff --git a/src/core/parser/parse_uri.h b/src/core/parser/parse_uri.h index 1638e264f5..a3c8c7142c 100644 --- a/src/core/parser/parse_uri.h +++ b/src/core/parser/parse_uri.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -39,7 +39,7 @@ extern str s_sip, s_sips, s_tel, s_tels, s_urn; /* buf= pointer to begining of uri (sip:x@foo.bar:5060;a=b?h=i) * len= len of uri - * returns: fills uri & returns <0 on error or 0 if ok + * returns: fills uri & returns <0 on error or 0 if ok */ int parse_uri(char *buf, int len, struct sip_uri* uri); int parse_sip_msg_uri(struct sip_msg* msg);

1 0

git:master:a69a5135: core: mem/fm - replaced old log macros
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: a69a5135cd70919c2207a0a747b1d850fd48d35c URL: https://github.com/kamailio/kamailio/commit/a69a5135cd70919c2207a0a747b1d85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T09:50:00+02:00 core: mem/fm - replaced old log macros --- Modified: src/core/mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/a69a5135cd70919c2207a0a747b1d85… Patch: https://github.com/kamailio/kamailio/commit/a69a5135cd70919c2207a0a747b1d85…

1 0

git:5.0:d49131e0: presence: subsription double delete fix
by Juha Heinanen 26 Jun '17

26 Jun '17

Module: kamailio Branch: 5.0 Commit: d49131e05033a78585bebea1bce503e97274a24e URL: https://github.com/kamailio/kamailio/commit/d49131e05033a78585bebea1bce503e… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-06-26T18:06:39+03:00 presence: subsription double delete fix - if timeout_rm_subs parameter set to "1" and NOTIFY timeout about expired subsription (cherry picked from commit 8e185ddf8e81af8d6283a87ec95116965235752a) --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/d49131e05033a78585bebea1bce503e… Patch: https://github.com/kamailio/kamailio/commit/d49131e05033a78585bebea1bce503e… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index e5cd1cdf42..63307c7e2e 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1847,7 +1847,7 @@ void p_tm_callback( struct cell *t, int type, struct tmcb_params *ps) if(ps->code == 404 || ps->code == 481 - || (ps->code == 408 && timeout_rm_subs) + || (ps->code == 408 && timeout_rm_subs && subs->status != TERMINATED_STATUS) || pres_get_delete_sub()) { delete_subs(&subs->pres_uri, &subs->event->name, &subs->to_tag, &subs->from_tag, &subs->callid);

1 0

presence: subsription double delete fix
by Juha Heinanen 26 Jun '17

26 Jun '17

How about backporting this fix to 5.0? https://github.com/kamailio/kamailio/commit/8e185ddf8e81af8d6283a87ec951169… -- Juha

2 1

[kamailio/kamailio] htable race condition on expired keys (#1152)
by lazedo 26 Jun '17

26 Jun '17

related to https://github.com/kamailio/kamailio/commit/be46742ebe162a2c48ee5ce27e09497… the below patch solves it, but i'm not sure of the implications why not let the expire routine do its job instead of checking expiration when adding a value ? also moved the `ht_handle_expired_record` after the record is removed ``` diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 1bbd079..92a9421 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -674,29 +674,29 @@ && strncmp(name->s, it->name.s, name->len)==0) { /* found */ - if(now>0 && it->expire!=0 && it->expire<now) { - /* entry has expired */ - ht_handle_expired_record(ht, it); - - if(ht->flags==PV_VAL_INT) { - /* initval is integer, use it to create a fresh entry */ - it->flags &= ~AVP_VAL_STR; - it->value.n = ht->initval.n; - /* increment will be done below */ - } else { - /* delete expired entry */ - if(it->prev==NULL) - ht->entries[idx].first = it->next; - else - it->prev->next = it->next; - if(it->next) - it->next->prev = it->prev; - ht->entries[idx].esize--; - if(mode) ht_slot_unlock(ht, idx); - ht_cell_free(it); - return NULL; - } - } +// if(now>0 && it->expire!=0 && it->expire<now) { +// /* entry has expired */ +// ht_handle_expired_record(ht, it); +// +// if(ht->flags==PV_VAL_INT) { +// /* initval is integer, use it to create a fresh entry */ +// it->flags &= ~AVP_VAL_STR; +// it->value.n = ht->initval.n; +// /* increment will be done below */ +// } else { +// /* delete expired entry */ +// if(it->prev==NULL) +// ht->entries[idx].first = it->next; +// else +// it->prev->next = it->next; +// if(it->next) +// it->next->prev = it->prev; +// ht->entries[idx].esize--; +// if(mode) ht_slot_unlock(ht, idx); +// ht_cell_free(it); +// return NULL; +// } +// } /* update value */ if(it->flags&AVP_VAL_STR) { @@ -803,21 +803,21 @@ && strncmp(name->s, it->name.s, name->len)==0) { /* found */ - if(ht->htexpire>0 && it->expire!=0 && it->expire<time(NULL)) { - /* entry has expired, delete it and return NULL */ - ht_handle_expired_record(ht, it); - - if(it->prev==NULL) - ht->entries[idx].first = it->next; - else - it->prev->next = it->next; - if(it->next) - it->next->prev = it->prev; - ht->entries[idx].esize--; - ht_slot_unlock(ht, idx); - ht_cell_free(it); - return NULL; - } +// if(ht->htexpire>0 && it->expire!=0 && it->expire<time(NULL)) { +// /* entry has expired, delete it and return NULL */ +// ht_handle_expired_record(ht, it); +// +// if(it->prev==NULL) +// ht->entries[idx].first = it->next; +// else +// it->prev->next = it->next; +// if(it->next) +// it->next->prev = it->prev; +// ht->entries[idx].esize--; +// ht_slot_unlock(ht, idx); +// ht_cell_free(it); +// return NULL; +// } if(old!=NULL) { if(old->msize>=it->msize) @@ -1056,7 +1056,6 @@ if(it->expire!=0 && it->expire<now) { /* expired */ - ht_handle_expired_record(ht, it); if(it->prev==NULL) ht->entries[i].first = it->next; else @@ -1064,6 +1063,7 @@ if(it->next) it->next->prev = it->prev; ht->entries[i].esize--; + ht_handle_expired_record(ht, it); ht_cell_free(it); } it = it0; ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1152

2 10

git:5.0:8038327f: htable: do not call expired event route on get/add operations
by Daniel-Constantin Mierla 26 Jun '17

26 Jun '17

Module: kamailio Branch: 5.0 Commit: 8038327f7c0c6e64899072f1c778699f040b2a0a URL: https://github.com/kamailio/kamailio/commit/8038327f7c0c6e64899072f1c778699… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-26T14:02:34+02:00 htable: do not call expired event route on get/add operations - have consistent behaviour with set operation - avoid accessing the same (expired) item twice, second after being removed if the item is accessed in the event route - reported by GH #1152 (cherry picked from commit 4514c91883d67ee062582aed7b414633609cf6ac) --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/8038327f7c0c6e64899072f1c778699… Patch: https://github.com/kamailio/kamailio/commit/8038327f7c0c6e64899072f1c778699… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 4c4ba5315b..a6e9c0eba6 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -676,7 +676,6 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, /* found */ if(now>0 && it->expire!=0 && it->expire<now) { /* entry has expired */ - ht_handle_expired_record(ht, it); if(ht->flags==PV_VAL_INT) { /* initval is integer, use it to create a fresh entry */ @@ -684,16 +683,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, it->value.n = ht->initval.n; /* increment will be done below */ } else { - /* delete expired entry */ - if(it->prev==NULL) - ht->entries[idx].first = it->next; - else - it->prev->next = it->next; - if(it->next) - it->next->prev = it->prev; - ht->entries[idx].esize--; if(mode) ht_slot_unlock(ht, idx); - ht_cell_free(it); return NULL; } } @@ -804,18 +794,8 @@ ht_cell_t* ht_cell_pkg_copy(ht_t *ht, str *name, ht_cell_t *old) { /* found */ if(ht->htexpire>0 && it->expire!=0 && it->expire<time(NULL)) { - /* entry has expired, delete it and return NULL */ - ht_handle_expired_record(ht, it); - - if(it->prev==NULL) - ht->entries[idx].first = it->next; - else - it->prev->next = it->next; - if(it->next) - it->next->prev = it->prev; - ht->entries[idx].esize--; + /* entry has expired, return NULL */ ht_slot_unlock(ht, idx); - ht_cell_free(it); return NULL; } if(old!=NULL) diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index 522811da58..c928bf1b49 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -91,7 +91,9 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, if((val==NULL) || (val->flags&PV_VAL_NULL)) { /* delete it */ - if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_DEL_CELL, &hpv->htname, &htname, 0, NULL, 0)!=0) { + if (hpv->ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_DEL_CELL, &hpv->htname, + &htname, 0, NULL, 0)!=0) { LM_ERR("dmq relication failed\n"); } ht_del_cell(hpv->ht, &htname); @@ -101,7 +103,9 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, if(val->flags&PV_TYPE_INT) { isval.n = val->ri; - if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, &htname, 0, &isval, 1)!=0) { + if (hpv->ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, + &htname, 0, &isval, 1)!=0) { LM_ERR("dmq relication failed\n"); } if(ht_set_cell(hpv->ht, &htname, 0, &isval, 1)!=0) @@ -111,7 +115,9 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, } } else { isval.s = val->rs; - if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, &htname, AVP_VAL_STR, &isval, 1)!=0) { + if (hpv->ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, + &htname, AVP_VAL_STR, &isval, 1)!=0) { LM_ERR("dmq relication failed\n"); } if(ht_set_cell(hpv->ht, &htname, AVP_VAL_STR, &isval, 1)!=0)

1 0

[kamailio/kamailio] Dispatcher destination attribute "socket" does not always work (#1161)
by Mikko Lehto 26 Jun '17

26 Jun '17

### Description Dispatcher destination attribute "socket", is not always respected. Syslog throws: ``` ERROR: <core> [core/socket_info.c:2067]: parse_protohostport(): bad port number in udp:10.2.10.49:5064 ``` ### Troubleshooting #### Reproduction relevant (I think) kamailio.cfg: ``` listen=udp:127.0.0.1:5060 listen=udp:10.2.10.49:5060 listen=udp:10.2.10.49:5064 listen=udp:10.2.10.49:5065 listen=udp:10.2.10.49:5066 auto_bind_ipv6=0 auto_aliases=0 modparam("dispatcher", "list_file", "/opt/kamailio/dispatcher.list") modparam("dispatcher", "flags", 2) modparam("dispatcher", "dst_avp", "$avp(ds_dst)") modparam("dispatcher", "grp_avp", "$avp(ds_grp)") modparam("dispatcher", "cnt_avp", "$avp(ds_cnt)") modparam("dispatcher", "dstid_avp", "$avp(ds_dstid)") modparam("dispatcher", "ds_hash_size", 9) modparam("dispatcher", "setid_pvname", "$var(ds_setid)") modparam("dispatcher", "attrs_avp", "$avp(ds_attrs_dst)") modparam("dispatcher", "attrs_pvname", "$avp(ds_attrs_from)") modparam("dispatcher", "sock_avp", "$avp(ds_socket)") modparam("dispatcher", "ds_default_socket", "udp:10.2.10.49:5066") modparam("dispatcher", "ds_ping_method", "OPTIONS") modparam("dispatcher", "ds_ping_interval", 10) modparam("dispatcher", "ds_probing_mode", 3) ``` dispatcher.list: ``` 3 sip:127.0.0.1:1234;transport=udp 8 0 duid=abc;socket=udp:10.2.10.49:5064;pipe=p10 3 sip:127.0.0.1:1235;transport=udp 8 0 duid=abc;pipe=p10;socket=udp:10.2.10.49:5065 3 sip:127.0.0.1:1236;transport=udp 8 0 duid=abc;pipe=p10 ``` Above kamailio.cfg and dispatcher.list demonstrates issue when probing (OPTIONS poll). I did not test actual request dispatching yet. #### Log Messages ``` 20:26:37 freebsd11 kamailio[31694]: DEBUG: dispatcher [dispatch.c:2660]: ds_ping_set(): probing set #3, URI sip:127.0.0.1:1236;transport=udp 20:26:37 freebsd11 kamailio[31694]: DEBUG: dispatcher [dispatch.c:2674]: ds_ping_set(): >>>--- here2 - using default socket ---<<< 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:988]: request(): request 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:1027]: request(): uac_r->ssock==udp:10.2.10.49:5066 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2077]: lookup_local_socket(): lookup_local_socket() phostp==udp:10.2.10.49:5066 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:1978]: parse_protohostport(): parse_protohostport ins==udp:10.2.10.49:5066 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2082]: lookup_local_socket(): lookup_local_socket() grep_sock_info() 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==9 && [10.2.10.49] == [127.0.0.1] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 0) matches port 5066 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==10 && [10.2.10.49] == [10.2.10.49] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 0) matches port 5066 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==10 && [10.2.10.49] == [10.2.10.49] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5064 (advertise 0) matches port 5066 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==10 && [10.2.10.49] == [10.2.10.49] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5065 (advertise 0) matches port 5066 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==10 && [10.2.10.49] == [10.2.10.49] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5066 (advertise 0) matches port 5066 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:427]: t_uac_prepare(): next_hop=<sip:127.0.0.1:1236;transport=udp> 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:152]: dlg2hash(): hashid 37205 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:640]: send_prepared_request_impl(): uac: 0x802572e98 branch: 0 to 127.0.0.1:1236 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [./../../core/onsend.h:69]: run_onsend(): required parameters are not available - ignoring 20:26:37 freebsd11 kamailio[31694]: DEBUG: dispatcher [dispatch.c:2660]: ds_ping_set(): probing set #3, URI sip:127.0.0.1:1235;transport=udp 20:26:37 freebsd11 kamailio[31694]: DEBUG: dispatcher [dispatch.c:2670]: ds_ping_set(): >>>--- here1 - using destination specific socket ---<<< 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:988]: request(): request 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:1027]: request(): uac_r->ssock==udp:10.2.10.49:5065 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2077]: lookup_local_socket(): lookup_local_socket() phostp==udp:10.2.10.49:5065 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:1978]: parse_protohostport(): parse_protohostport ins==udp:10.2.10.49:5065 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2082]: lookup_local_socket(): lookup_local_socket() grep_sock_info() 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==9 && [10.2.10.49] == [127.0.0.1] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 0) matches port 5065 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==10 && [10.2.10.49] == [10.2.10.49] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 0) matches port 5065 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==10 && [10.2.10.49] == [10.2.10.49] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5064 (advertise 0) matches port 5065 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 10==10 && [10.2.10.49] == [10.2.10.49] 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5065 (advertise 0) matches port 5065 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:427]: t_uac_prepare(): next_hop=<sip:127.0.0.1:1235;transport=udp> 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:152]: dlg2hash(): hashid 37202 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:640]: send_prepared_request_impl(): uac: 0x802572148 branch: 0 to 127.0.0.1:1235 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [./../../core/onsend.h:69]: run_onsend(): required parameters are not available - ignoring 20:26:37 freebsd11 kamailio[31694]: DEBUG: dispatcher [dispatch.c:2660]: ds_ping_set(): probing set #3, URI sip:127.0.0.1:1234;transport=udp 20:26:37 freebsd11 kamailio[31694]: DEBUG: dispatcher [dispatch.c:2670]: ds_ping_set(): >>>--- here1 - using destination specific socket ---<<< 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:988]: request(): request 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:1027]: request(): uac_r->ssock==udp:10.2.10.49:5064 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2077]: lookup_local_socket(): lookup_local_socket() phostp==udp:10.2.10.49:5064 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:1978]: parse_protohostport(): parse_protohostport ins==udp:10.2.10.49:5064 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2020]: parse_protohostport(): B *tmp==; 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2024]: parse_protohostport(): Y looks like strtol() ran too far 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2026]: parse_protohostport(): ins->len : 19 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2027]: parse_protohostport(): ins->s : 0x80255fe88 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2028]: parse_protohostport(): first : 0x80255fe8b 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2029]: parse_protohostport(): first+1 : 0x80255fe8c 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2030]: parse_protohostport(): second : 0x80255fe96 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2031]: parse_protohostport(): second+1 : 0x80255fe97 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2032]: parse_protohostport(): ins s+len : 0x80255fe9b 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2033]: parse_protohostport(): tmp : 0x80255fe9b 20:26:37 freebsd11 kamailio[31694]: ERROR: <core> [core/socket_info.c:2067]: parse_protohostport(): bad port number in udp:10.2.10.49:5064 20:26:37 freebsd11 kamailio[31694]: DEBUG: <core> [core/socket_info.c:2079]: lookup_local_socket(): lookup_local_socket() return NULL 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:427]: t_uac_prepare(): next_hop=<sip:127.0.0.1:1234;transport=udp> 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:152]: dlg2hash(): hashid 37203 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [uac.c:640]: send_prepared_request_impl(): uac: 0x8025713f8 branch: 0 to 127.0.0.1:1234 20:26:37 freebsd11 kamailio[31694]: DEBUG: tm [./../../core/onsend.h:69]: run_onsend(): required parameters are not available - ignoring ``` NOTE: above output contains additional debug statements, see below and 77394f06e8349de7565adcc58946da07ee0cf7d7. #### SIP Traffic ``` $ doas tcpdump -i lo0 -s 0 -n port 5060 or port 5064 or port 5065 or port 5066 tcpdump: verbose output suppressed, use -v or -vv for full protocol decode listening on lo0, link-type NULL (BSD loopback), capture size 262144 bytes . . . 20:26:37.465870 IP 10.2.10.49.5066 > 127.0.0.1.1236: UDP, length 374 20:26:37.465885 IP 10.2.10.49.5065 > 127.0.0.1.1235: UDP, length 374 20:26:37.465894 IP 10.2.10.49.5060 > 127.0.0.1.1234: SIP: OPTIONS sip:127.0.0.1:1234;transport=udp SIP/2.0 20:26:37.968876 IP 10.2.10.49.5066 > 127.0.0.1.1236: UDP, length 374 20:26:37.969043 IP 10.2.10.49.5065 > 127.0.0.1.1235: UDP, length 374 20:26:37.969216 IP 10.2.10.49.5060 > 127.0.0.1.1234: SIP: OPTIONS sip:127.0.0.1:1234;transport=udp SIP/2.0 . . . ``` Summary of sent packets: src port 5066 == listener socket + dispatcher default socket src port 5065 == listener socket + explicitly set to destination 127.0.0.1:1235 src port 5060 == listener socket, not mentioned in dispatcher config Probe packets to destination 127.0.0.1:1234 are sent with src port 5060, expected 5064. ### Possible Solutions Looks like ```strtol(second+1, &tmp, 10)``` in ```core/socket_info.c``` runs too far because it expects null terminated string but is passed ```char*``` of Kamailio ```str``` struct instead. Commit 77394f06e8349de7565adcc58946da07ee0cf7d7 tries to highlights this. ### Additional Information Found initially in stable 5.0.2 with new configuration. Replicated in master (20a961624bbe164d9120b7c9ac60df8ff1daaae4). ``` version: kamailio 5.1.0-dev4 (x86_64/freebsd) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, select, kqueue. id: unknown compiled on 19:21:12 Jun 21 2017 with clang39 3.9 ``` * **Operating System**: FreeBSD 11 ``` $ uname -a FreeBSD freebsd11 11.0-RELEASE-p9 FreeBSD 11.0-RELEASE-p9 #0: Tue Apr 11 08:48:40 UTC 2017 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1161

2 6

git:master:c8f7be02: corex: added $cfg(route) - return name of routing block for crt action
by Daniel-Constantin Mierla 26 Jun '17

26 Jun '17

Module: kamailio Branch: master Commit: c8f7be02e20f434f88c084c38b66d5dd34cf4dc1 URL: https://github.com/kamailio/kamailio/commit/c8f7be02e20f434f88c084c38b66d5d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-26T08:22:34+02:00 corex: added $cfg(route) - return name of routing block for crt action - aliased $cfg(file) to $cfg(name) --- Modified: src/modules/corex/corex_var.c --- Diff: https://github.com/kamailio/kamailio/commit/c8f7be02e20f434f88c084c38b66d5d… Patch: https://github.com/kamailio/kamailio/commit/c8f7be02e20f434f88c084c38b66d5d… --- diff --git a/src/modules/corex/corex_var.c b/src/modules/corex/corex_var.c index b2dea26734..8a36158fb4 100644 --- a/src/modules/corex/corex_var.c +++ b/src/modules/corex/corex_var.c @@ -44,6 +44,13 @@ int pv_parse_cfg_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 0; else if(strncmp(in->s, "name", 4)==0) sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "file", 4)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else goto error; + break; + case 5: + if(strncmp(in->s, "route", 5)==0) + sp->pvp.pvn.u.isname.name.n = 2; else goto error; break; default: @@ -72,7 +79,12 @@ int pv_get_cfg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) switch(param->pvn.u.isname.name.n) { case 1: - n = get_cfg_crt_name(); + n = get_cfg_crt_file_name(); + if(n==0) + return pv_get_null(msg, param, res); + return pv_get_strzval(msg, param, res, n); + case 2: + n = get_cfg_crt_route_name(); if(n==0) return pv_get_null(msg, param, res); return pv_get_strzval(msg, param, res, n);

1 0

git:master:c3212783: core: added function to return route block name from crt action
by Daniel-Constantin Mierla 26 Jun '17

26 Jun '17

Module: kamailio Branch: master Commit: c3212783da0af2358bcf0bcf4b5da4a8f0629251 URL: https://github.com/kamailio/kamailio/commit/c3212783da0af2358bcf0bcf4b5da4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-26T08:22:34+02:00 core: added function to return route block name from crt action - renamed the function that returns cfg file name from crt action --- Modified: src/core/action.c Modified: src/core/action.h --- Diff: https://github.com/kamailio/kamailio/commit/c3212783da0af2358bcf0bcf4b5da4a… Patch: https://github.com/kamailio/kamailio/commit/c3212783da0af2358bcf0bcf4b5da4a… --- diff --git a/src/core/action.c b/src/core/action.c index def9a64106..f766a0b894 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -103,13 +103,21 @@ int get_cfg_crt_line(void) } /* return name of config for current executed action */ -char *get_cfg_crt_name(void) +char *get_cfg_crt_file_name(void) { if(_cfg_crt_action==0) return 0; return _cfg_crt_action->cfile; } +/* return name of routing block for current executed action */ +char *get_cfg_crt_route_name(void) +{ + if(_cfg_crt_action==0) + return 0; + return _cfg_crt_action->rname; +} + /* handle the exit code of a module function call. * (used internally in do_action()) * @param h - script handle (h->last_retcode and h->run_flags will be set). diff --git a/src/core/action.h b/src/core/action.h index b4591aa115..c528fa972c 100644 --- a/src/core/action.h +++ b/src/core/action.h @@ -62,7 +62,8 @@ int run_top_route(struct action* a, sip_msg_t* msg, struct run_act_ctx* c); cfg_action_t *get_cfg_crt_action(void); int get_cfg_crt_line(void); -char *get_cfg_crt_name(void); +char *get_cfg_crt_file_name(void); +char *get_cfg_crt_route_name(void); void set_max_recursive_level(unsigned int lev);

1 0

git:master:7dbf3fe5: modules: readme files regenerated - jsonrpcs ... [skip ci]
by Kamailio Dev 25 Jun '17

25 Jun '17

Module: kamailio Branch: master Commit: 7dbf3fe5ec323571908b6bf3ef0d9e95e84d90dc URL: https://github.com/kamailio/kamailio/commit/7dbf3fe5ec323571908b6bf3ef0d9e9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-25T19:16:17+02:00 modules: readme files regenerated - jsonrpcs ... [skip ci] --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/7dbf3fe5ec323571908b6bf3ef0d9e9… Patch: https://github.com/kamailio/kamailio/commit/7dbf3fe5ec323571908b6bf3ef0d9e9… --- diff --git a/src/modules/jsonrpcs/README b/src/modules/jsonrpcs/README index 8457e16b4a..d615babde5 100644 --- a/src/modules/jsonrpcs/README +++ b/src/modules/jsonrpcs/README @@ -396,7 +396,7 @@ event_route[xhttp:request] { Example 1.15. jsonrpc_exec usage ... -jsonrpc_exec({"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); +jsonrpc_exec('{"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); ... 6. JSONRPC Commands

1 0

git:master:797bd944: Merge branch 'mslehto/issue1161'
by Mikko Lehto 25 Jun '17

25 Jun '17

Module: kamailio Branch: master Commit: 797bd94487cc05269b973c0dcad542838d8acbef URL: https://github.com/kamailio/kamailio/commit/797bd94487cc05269b973c0dcad5428… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-25T20:13:35+03:00 Merge branch 'mslehto/issue1161' --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/797bd94487cc05269b973c0dcad5428… Patch: https://github.com/kamailio/kamailio/commit/797bd94487cc05269b973c0dcad5428… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index f280f2dcb0..62a15f4c93 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1973,7 +1973,7 @@ int parse_protohostport(str* ins, sr_phostp_t *r) char* second; /* second ':' occurrence */ char* p; int bracket; - char* tmp; + str tmp=STR_NULL; first=second=0; bracket=0; @@ -2012,15 +2012,20 @@ int parse_protohostport(str* ins, sr_phostp_t *r) if (second) { /* 2 ':' found => check if valid */ if (parse_proto((unsigned char*)ins->s, first-ins->s, &r->proto)<0) goto error_proto; - r->port=strtol(second+1, &tmp, 10); - if ((tmp==0)||(*tmp)||(tmp==second+1)) goto error_port; + + tmp.s=second+1; + tmp.len=(ins->s + ins->len) - tmp.s; + + if (str2int(&tmp, (unsigned int *)&(r->port))<0) goto error_port; + r->host.s=first+1; r->host.len=(int)(second-r->host.s); goto end; } /* only 1 ':' found => it's either proto:host or host:port */ - r->port=strtol(first+1, &tmp, 10); - if ((tmp==0)||(*tmp)||(tmp==first+1)){ + tmp.s=first+1; + tmp.len=(ins->s + ins->len) - tmp.s; + if (str2int(&tmp, (unsigned int *)&(r->port))<0) { /* invalid port => it's proto:host */ if (parse_proto((unsigned char*)ins->s, first-ins->s, &r->proto)<0) goto error_proto;

1 0

git:master:baf2d095: core/socket_info: use internal str2int() instead of strtol()
by Mikko Lehto 25 Jun '17

25 Jun '17

Module: kamailio Branch: master Commit: baf2d095b1d4dcc932ece9d48a6a8c397fa7b1a7 URL: https://github.com/kamailio/kamailio/commit/baf2d095b1d4dcc932ece9d48a6a8c3… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-24T13:27:40+03:00 core/socket_info: use internal str2int() instead of strtol() - strtol() works only for null terminated strings - fix for issue GH #1161 --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/baf2d095b1d4dcc932ece9d48a6a8c3… Patch: https://github.com/kamailio/kamailio/commit/baf2d095b1d4dcc932ece9d48a6a8c3… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index f280f2dcb0..62a15f4c93 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1973,7 +1973,7 @@ int parse_protohostport(str* ins, sr_phostp_t *r) char* second; /* second ':' occurrence */ char* p; int bracket; - char* tmp; + str tmp=STR_NULL; first=second=0; bracket=0; @@ -2012,15 +2012,20 @@ int parse_protohostport(str* ins, sr_phostp_t *r) if (second) { /* 2 ':' found => check if valid */ if (parse_proto((unsigned char*)ins->s, first-ins->s, &r->proto)<0) goto error_proto; - r->port=strtol(second+1, &tmp, 10); - if ((tmp==0)||(*tmp)||(tmp==second+1)) goto error_port; + + tmp.s=second+1; + tmp.len=(ins->s + ins->len) - tmp.s; + + if (str2int(&tmp, (unsigned int *)&(r->port))<0) goto error_port; + r->host.s=first+1; r->host.len=(int)(second-r->host.s); goto end; } /* only 1 ':' found => it's either proto:host or host:port */ - r->port=strtol(first+1, &tmp, 10); - if ((tmp==0)||(*tmp)||(tmp==first+1)){ + tmp.s=first+1; + tmp.len=(ins->s + ins->len) - tmp.s; + if (str2int(&tmp, (unsigned int *)&(r->port))<0) { /* invalid port => it's proto:host */ if (parse_proto((unsigned char*)ins->s, first-ins->s, &r->proto)<0) goto error_proto;

1 0

git:master:f0f1a9a8: modules/jsonrpcs: add missing apostrophe to example
by Mikko Lehto 25 Jun '17

25 Jun '17

Module: kamailio Branch: master Commit: f0f1a9a8db1f5238b0ace1d3f190d0d9f0b2628d URL: https://github.com/kamailio/kamailio/commit/f0f1a9a8db1f5238b0ace1d3f190d0d… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-25T20:02:02+03:00 modules/jsonrpcs: add missing apostrophe to example --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f0f1a9a8db1f5238b0ace1d3f190d0d… Patch: https://github.com/kamailio/kamailio/commit/f0f1a9a8db1f5238b0ace1d3f190d0d… --- diff --git a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml index 587eba906e..5d4bd25fac 100644 --- a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml +++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml @@ -458,7 +458,7 @@ event_route[xhttp:request] { <title><function>jsonrpc_exec</function> usage</title> <programlisting format="linespecific"> ... -jsonrpc_exec({"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); +jsonrpc_exec('{"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); ... </programlisting> </example>

1 0

git:master:3188da9a: modules: readme files regenerated - topoh ... [skip ci]
by Kamailio Dev 25 Jun '17

25 Jun '17

Module: kamailio Branch: master Commit: 3188da9abdf5b02d4596586b979478675d2c363d URL: https://github.com/kamailio/kamailio/commit/3188da9abdf5b02d4596586b9794786… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-25T10:16:40+02:00 modules: readme files regenerated - topoh ... [skip ci] --- Modified: src/modules/topoh/README --- Diff: https://github.com/kamailio/kamailio/commit/3188da9abdf5b02d4596586b9794786… Patch: https://github.com/kamailio/kamailio/commit/3188da9abdf5b02d4596586b9794786… --- diff --git a/src/modules/topoh/README b/src/modules/topoh/README index 932aa846b7..0c1044cb09 100644 --- a/src/modules/topoh/README +++ b/src/modules/topoh/README @@ -34,6 +34,8 @@ Daniel-Constantin Mierla 3.7. vparam_prefix (str) 3.8. callid_prefix (str) 3.9. sanity_checks (integer) + 3.10. uri_prefix_checks (integer) + 3.11. event_callback (str) 4. Event Routes @@ -50,7 +52,9 @@ Daniel-Constantin Mierla 1.7. Set vparam_prefix parameter 1.8. Set callid_prefix parameter 1.9. Set sanity_checks parameter - 1.10. Usage of event_route[topoh:msg-outgoing] + 1.10. Set uri_prefix_checks parameter + 1.11. Set event_callback parameter + 1.12. Usage of event_route[topoh:msg-outgoing] Chapter 1. Admin Guide @@ -73,6 +77,8 @@ Chapter 1. Admin Guide 3.7. vparam_prefix (str) 3.8. callid_prefix (str) 3.9. sanity_checks (integer) + 3.10. uri_prefix_checks (integer) + 3.11. event_callback (str) 4. Event Routes @@ -122,6 +128,8 @@ Chapter 1. Admin Guide 3.7. vparam_prefix (str) 3.8. callid_prefix (str) 3.9. sanity_checks (integer) + 3.10. uri_prefix_checks (integer) + 3.11. event_callback (str) 3.1. mask_key (str) @@ -236,6 +244,46 @@ modparam("topoh", "callid_prefix", "***") modparam("topoh", "sanity_checks", 1) ... +3.10. uri_prefix_checks (integer) + + If set to 1, topoh module will check if URIs to be decoded match the + expected prefix composed from mask IP and parameter name prefix. It can + make the topoh processing safer by avoiding to try decoding URIs which + were not encoded previously by topoh. + + Note: do not enable this option if you have SIP devices that can alter + the URI values it takes from Contact or Record-Route headers (like + adding port 5060 when no port is in received URIs, or thet introduce + new parameters at unknown position). + + Default value is 0. + + Example 1.10. Set uri_prefix_checks parameter +... +modparam("topoh", "uri_prefix_checks", 1) +... + +3.11. event_callback (str) + + The name of the function in the KEMI configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead of + event_route[...] blocks. + + The function receives a string parameter with the name of the event. + + Default value is 'empty' (no function is executed for events). + + Example 1.11. Set event_callback parameter +... +modparam("topoh", "event_callback", "ksr_topoh_event") +... +-- event callback function implemented in Lua +function ksr_topoh_event(evname) + KSR.info("===== topoh module triggered event: " .. evname .. "\n"); + return 1; +end +... + 4. Event Routes 4.1. event_route[topoh:msg-outgoing] @@ -252,7 +300,7 @@ modparam("topoh", "sanity_checks", 1) reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.10. Usage of event_route[topoh:msg-outgoing] + Example 1.12. Usage of event_route[topoh:msg-outgoing] ... event_route[topoh:msg-outgoing] { if($sndto(ip)=="10.1.1.10") {

1 0

git:5.0:c71bac4a: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 25 Jun '17

25 Jun '17

Module: kamailio Branch: 5.0 Commit: c71bac4aebbef927f7ebbed53c3d51531d6d3622 URL: https://github.com/kamailio/kamailio/commit/c71bac4aebbef927f7ebbed53c3d515… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-25T10:16:23+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/topoh/README --- Diff: https://github.com/kamailio/kamailio/commit/c71bac4aebbef927f7ebbed53c3d515… Patch: https://github.com/kamailio/kamailio/commit/c71bac4aebbef927f7ebbed53c3d515… --- diff --git a/src/modules/topoh/README b/src/modules/topoh/README index 213524545c..fb7442cc56 100644 --- a/src/modules/topoh/README +++ b/src/modules/topoh/README @@ -34,6 +34,7 @@ Daniel-Constantin Mierla 3.7. vparam_prefix (str) 3.8. callid_prefix (str) 3.9. sanity_checks (integer) + 3.10. uri_prefix_checks (integer) List of Examples @@ -46,6 +47,7 @@ Daniel-Constantin Mierla 1.7. Set vparam_prefix parameter 1.8. Set callid_prefix parameter 1.9. Set sanity_checks parameter + 1.10. Set uri_prefix_checks parameter Chapter 1. Admin Guide @@ -68,6 +70,7 @@ Chapter 1. Admin Guide 3.7. vparam_prefix (str) 3.8. callid_prefix (str) 3.9. sanity_checks (integer) + 3.10. uri_prefix_checks (integer) 1. Overview @@ -113,6 +116,7 @@ Chapter 1. Admin Guide 3.7. vparam_prefix (str) 3.8. callid_prefix (str) 3.9. sanity_checks (integer) + 3.10. uri_prefix_checks (integer) 3.1. mask_key (str) @@ -226,3 +230,22 @@ modparam("topoh", "callid_prefix", "***") ... modparam("topoh", "sanity_checks", 1) ... + +3.10. uri_prefix_checks (integer) + + If set to 1, topoh module will check if URIs to be decoded match the + expected prefix composed from mask IP and parameter name prefix. It can + make the topoh processing safer by avoiding to try decoding URIs which + were not encoded previously by topoh. + + Note: do not enable this option if you have SIP devices that can alter + the URI values it takes from Contact or Record-Route headers (like + adding port 5060 when no port is in received URIs, or thet introduce + new parameters at unknown position). + + Default value is 0. + + Example 1.10. Set uri_prefix_checks parameter +... +modparam("topoh", "uri_prefix_checks", 1) +...

1 0

git:5.0:826b3cab: topoh: documented uri_prefix_checks parameter
by Daniel-Constantin Mierla 25 Jun '17

25 Jun '17

Module: kamailio Branch: 5.0 Commit: 826b3cab606fb51c7139fe81463aeb2409f40b67 URL: https://github.com/kamailio/kamailio/commit/826b3cab606fb51c7139fe81463aeb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-25T10:14:52+02:00 topoh: documented uri_prefix_checks parameter (cherry picked from commit ca3f2fc6dd2c94410b225d2efb82081b828ddd01) --- Modified: src/modules/topoh/doc/topoh_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/826b3cab606fb51c7139fe81463aeb2… Patch: https://github.com/kamailio/kamailio/commit/826b3cab606fb51c7139fe81463aeb2… --- diff --git a/src/modules/topoh/doc/topoh_admin.xml b/src/modules/topoh/doc/topoh_admin.xml index 2d92f21e47..83850d277c 100644 --- a/src/modules/topoh/doc/topoh_admin.xml +++ b/src/modules/topoh/doc/topoh_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -253,7 +253,34 @@ modparam("topoh", "sanity_checks", 1) </programlisting> </example> </section> - + <section> + <title><varname>uri_prefix_checks</varname> (integer)</title> + <para> + If set to 1, topoh module will check if URIs to be decoded match + the expected prefix composed from mask IP and parameter name prefix. + It can make the topoh processing safer by avoiding to try decoding + URIs which were not encoded previously by topoh. + </para> + <para> + Note: do not enable this option if you have SIP devices that can + alter the URI values it takes from Contact or Record-Route headers + (like adding port 5060 when no port is in received URIs, or + thet introduce new parameters at unknown position). + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>uri_prefix_checks</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topoh", "uri_prefix_checks", 1) +... +</programlisting> + </example> + </section> </section> </chapter>

1 0

git:5.0:ee4c2a78: topoh: coherent whitespacing and indentation
by Daniel-Constantin Mierla 25 Jun '17

25 Jun '17

Module: kamailio Branch: 5.0 Commit: ee4c2a7811552497fe0321fc92b2ecc68034cd44 URL: https://github.com/kamailio/kamailio/commit/ee4c2a7811552497fe0321fc92b2ecc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-25T10:12:25+02:00 topoh: coherent whitespacing and indentation (cherry picked from commit 66ab19a010f833a7c53f7f46de29a749609d5eef) --- Modified: src/modules/topoh/Makefile Modified: src/modules/topoh/api.h Modified: src/modules/topoh/doc/topoh.xml Modified: src/modules/topoh/th_mask.c Modified: src/modules/topoh/th_mask.h Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/ee4c2a7811552497fe0321fc92b2ecc… Patch: https://github.com/kamailio/kamailio/commit/ee4c2a7811552497fe0321fc92b2ecc…

1 0

git:5.0:a9d6ffa5: topoh: option to disable uri prefix checks
by Daniel-Constantin Mierla 25 Jun '17

25 Jun '17

Module: kamailio Branch: 5.0 Commit: a9d6ffa5f39e048642bf14129b9b484250cce3ae URL: https://github.com/kamailio/kamailio/commit/a9d6ffa5f39e048642bf14129b9b484… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-25T10:10:58+02:00 topoh: option to disable uri prefix checks - some devices do not copy the exact URI as received in headers (Contact, Record-Route) - they can add default port or mix parameters - reported by GH #1165 (cherry picked from commit de3386e4a303adecc3eee809c05e0654b7a05065) --- Modified: src/modules/topoh/th_msg.c Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a9d6ffa5f39e048642bf14129b9b484… Patch: https://github.com/kamailio/kamailio/commit/a9d6ffa5f39e048642bf14129b9b484… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index a1f117e316..24bb32e185 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -57,6 +57,7 @@ extern str th_vparam_prefix; extern int th_param_mask_callid; extern int th_mask_addr_myself; +extern int th_uri_prefix_checks; int th_skip_rw(char *s, int len) { @@ -391,8 +392,8 @@ int th_unmask_via(sip_msg_t *msg, str *cookie) if(i!=1) { /* Skip if via is not encoded */ - if (via->host.len!=th_ip.len - || strncasecmp(via->host.s, th_ip.s, th_ip.len)!=0) + if (th_uri_prefix_checks && (via->host.len!=th_ip.len + || strncasecmp(via->host.s, th_ip.s, th_ip.len)!=0)) { LM_DBG("via %d is not encoded",i); continue; @@ -687,10 +688,13 @@ int th_unmask_route(sip_msg_t *msg) if(i!=1) { /* Skip if route is not encoded */ - if ((rr->nameaddr.uri.len<th_uri_prefix.len) || - (strncasecmp(rr->nameaddr.uri.s,th_uri_prefix.s,th_uri_prefix.len)!=0)) + if (th_uri_prefix_checks + && ((rr->nameaddr.uri.len<th_uri_prefix.len) || + (strncasecmp(rr->nameaddr.uri.s,th_uri_prefix.s, + th_uri_prefix.len)!=0))) { - LM_DBG("rr %d is not encoded: [%.*s]",i,rr->nameaddr.uri.len,rr->nameaddr.uri.s); + LM_DBG("rr %d is not encoded: [%.*s]", i, + rr->nameaddr.uri.len, rr->nameaddr.uri.s); rr = rr->next; continue; } @@ -736,8 +740,9 @@ int th_unmask_ruri(sip_msg_t *msg) str out; /* Do nothing if ruri is not encoded */ - if ((REQ_LINE(msg).uri.len<th_uri_prefix.len) || - (strncasecmp(REQ_LINE(msg).uri.s,th_uri_prefix.s,th_uri_prefix.len)!=0)) + if (th_uri_prefix_checks && ((REQ_LINE(msg).uri.len<th_uri_prefix.len) || + (strncasecmp(REQ_LINE(msg).uri.s, th_uri_prefix.s, + th_uri_prefix.len)!=0))) { LM_DBG("ruri [%.*s] is not encoded",REQ_LINE(msg).uri.len,REQ_LINE(msg).uri.s); return 0; @@ -798,8 +803,8 @@ int th_unmask_refer_to(sip_msg_t *msg) uri = &(get_refer_to(msg)->uri); /* Do nothing if refer_to is not encoded */ - if ((uri->len<th_uri_prefix.len) - || (strncasecmp(uri->s, th_uri_prefix.s, th_uri_prefix.len)!=0)) + if (th_uri_prefix_checks && ((uri->len<th_uri_prefix.len) + || (strncasecmp(uri->s, th_uri_prefix.s, th_uri_prefix.len)!=0))) { LM_DBG("refer-to [%.*s] is not encoded",uri->len,uri->s); return 0; diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 5eb7490b85..4ff52f6e0a 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -74,11 +74,12 @@ str th_uri_prefix = {0, 0}; int th_param_mask_callid = 0; int th_sanity_checks = 0; -sanity_api_t scb; +int th_uri_prefix_checks = 0; int th_mask_addr_myself = 0; int th_msg_received(void *data); int th_msg_sent(void *data); +sanity_api_t scb; /** module functions */ static int mod_init(void); @@ -93,6 +94,7 @@ static param_export_t params[]={ {"vparam_prefix", PARAM_STR, &th_vparam_prefix}, {"callid_prefix", PARAM_STR, &th_callid_prefix}, {"sanity_checks", PARAM_INT, &th_sanity_checks}, + {"uri_prefix_checks", PARAM_INT, &th_uri_prefix_checks}, {0,0,0} };

1 0

[kamailio/kamailio] incorrect ACK BYE packets routing with topoh enabled on kamailio 5.0.2 (#1165)
by Sergey Lavrov 25 Jun '17

25 Jun '17

### Description  After upgrading kamailio from 4.4.5 to 5.0.2 ACK/BYE packets are routed incorrectly. Instead of routing from KAMAILIO INT IP to SIP UAC #2 ACK/BYE packets are routed from KAMAILIO EXT IP to KAMAILIO INT IP. I attached two diagrams. First is from kamailio 4.4.5 with correct routing. Second is from kamailio 5.0.2 with wrong routing. One of improtant notice is when topoh module is disabled ACK/BYE packets are routed correctly on kamailio 5.0.2. Also in kamailio 5.0.2 DURI and RURI of ACK/BYE packets are populated not by Contact value of OK packet from SIP UA #2 but Record-Route value from OK packet. In kamailio 4.4.5 DURI is not populated at all and RURI is correct one. ### Troubleshooting #### SIP Traffic  SIP trace diagram from kamailio 4.4.5: http://imgur.com/5J95spW SIP trace diagram from kamailio 5.0.2: http://imgur.com/TDOGdgA  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 4.4.5 (x86_64/linux) f98162 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: f98162 compiled on 03:47:31 Feb 27 2017 with gcc 4.8.5 ``` * **Operating System**:  ``` Red Hat Enterprise Linux Server release 7.3 (Maipo) Linux 2.6.32-042stab113.21 #1 SMP Wed Mar 23 11:05:25 MSK 2016 x86_64 x86_64 x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1165

2 4

git:master:1b9e1f78: topoh: documented event_callback parameter
by Daniel-Constantin Mierla 25 Jun '17

25 Jun '17

Module: kamailio Branch: master Commit: 1b9e1f788d3c4c8ebaf81e252d07fe3200ca37e8 URL: https://github.com/kamailio/kamailio/commit/1b9e1f788d3c4c8ebaf81e252d07fe3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-25T10:04:53+02:00 topoh: documented event_callback parameter --- Modified: src/modules/topoh/doc/topoh_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1b9e1f788d3c4c8ebaf81e252d07fe3… Patch: https://github.com/kamailio/kamailio/commit/1b9e1f788d3c4c8ebaf81e252d07fe3… --- diff --git a/src/modules/topoh/doc/topoh_admin.xml b/src/modules/topoh/doc/topoh_admin.xml index 0d8bda5bb1..f421f8ce64 100644 --- a/src/modules/topoh/doc/topoh_admin.xml +++ b/src/modules/topoh/doc/topoh_admin.xml @@ -281,6 +281,36 @@ modparam("topoh", "uri_prefix_checks", 1) </programlisting> </example> </section> + <section id="topoh.p.event_callback"> + <title><varname>event_callback</varname> (str)</title> + <para> + The name of the function in the KEMI configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of event_route[...] blocks. + </para> + <para> + The function receives a string parameter with the name of the event. + </para> + <para> + <emphasis> + Default value is 'empty' (no function is executed for events). + </emphasis> + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topoh", "event_callback", "ksr_topoh_event") +... +-- event callback function implemented in Lua +function ksr_topoh_event(evname) + KSR.info("===== topoh module triggered event: " .. evname .. "\n"); + return 1; +end +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:master:ca3f2fc6: topoh: documented uri_prefix_checks parameter
by Daniel-Constantin Mierla 25 Jun '17

25 Jun '17

Module: kamailio Branch: master Commit: ca3f2fc6dd2c94410b225d2efb82081b828ddd01 URL: https://github.com/kamailio/kamailio/commit/ca3f2fc6dd2c94410b225d2efb82081… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-25T10:00:01+02:00 topoh: documented uri_prefix_checks parameter --- Modified: src/modules/topoh/doc/topoh_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ca3f2fc6dd2c94410b225d2efb82081… Patch: https://github.com/kamailio/kamailio/commit/ca3f2fc6dd2c94410b225d2efb82081… --- diff --git a/src/modules/topoh/doc/topoh_admin.xml b/src/modules/topoh/doc/topoh_admin.xml index c3366dd735..0d8bda5bb1 100644 --- a/src/modules/topoh/doc/topoh_admin.xml +++ b/src/modules/topoh/doc/topoh_admin.xml @@ -253,6 +253,34 @@ modparam("topoh", "sanity_checks", 1) </programlisting> </example> </section> + <section> + <title><varname>uri_prefix_checks</varname> (integer)</title> + <para> + If set to 1, topoh module will check if URIs to be decoded match + the expected prefix composed from mask IP and parameter name prefix. + It can make the topoh processing safer by avoiding to try decoding + URIs which were not encoded previously by topoh. + </para> + <para> + Note: do not enable this option if you have SIP devices that can + alter the URI values it takes from Contact or Record-Route headers + (like adding port 5060 when no port is in received URIs, or + thet introduce new parameters at unknown position). + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>uri_prefix_checks</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topoh", "uri_prefix_checks", 1) +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:master:66ab19a0: topoh: coherent whitespacing and indentation
by Daniel-Constantin Mierla 25 Jun '17

25 Jun '17

Module: kamailio Branch: master Commit: 66ab19a010f833a7c53f7f46de29a749609d5eef URL: https://github.com/kamailio/kamailio/commit/66ab19a010f833a7c53f7f46de29a74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-25T09:54:09+02:00 topoh: coherent whitespacing and indentation --- Modified: src/modules/topoh/Makefile Modified: src/modules/topoh/api.h Modified: src/modules/topoh/doc/topoh.xml Modified: src/modules/topoh/th_mask.c Modified: src/modules/topoh/th_mask.h Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/66ab19a010f833a7c53f7f46de29a74… Patch: https://github.com/kamailio/kamailio/commit/66ab19a010f833a7c53f7f46de29a74…

1 0

git:master:de3386e4: topoh: option to disable uri prefix checks
by Daniel-Constantin Mierla 25 Jun '17

25 Jun '17

Module: kamailio Branch: master Commit: de3386e4a303adecc3eee809c05e0654b7a05065 URL: https://github.com/kamailio/kamailio/commit/de3386e4a303adecc3eee809c05e065… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-25T09:48:26+02:00 topoh: option to disable uri prefix checks - some devices do not copy the exact URI as received in headers (Contact, Record-Route) - they can add default port or mix parameters - reported by GH #1165 --- Modified: src/modules/topoh/th_msg.c Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/de3386e4a303adecc3eee809c05e065… Patch: https://github.com/kamailio/kamailio/commit/de3386e4a303adecc3eee809c05e065… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index a1f117e316..24bb32e185 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -57,6 +57,7 @@ extern str th_vparam_prefix; extern int th_param_mask_callid; extern int th_mask_addr_myself; +extern int th_uri_prefix_checks; int th_skip_rw(char *s, int len) { @@ -391,8 +392,8 @@ int th_unmask_via(sip_msg_t *msg, str *cookie) if(i!=1) { /* Skip if via is not encoded */ - if (via->host.len!=th_ip.len - || strncasecmp(via->host.s, th_ip.s, th_ip.len)!=0) + if (th_uri_prefix_checks && (via->host.len!=th_ip.len + || strncasecmp(via->host.s, th_ip.s, th_ip.len)!=0)) { LM_DBG("via %d is not encoded",i); continue; @@ -687,10 +688,13 @@ int th_unmask_route(sip_msg_t *msg) if(i!=1) { /* Skip if route is not encoded */ - if ((rr->nameaddr.uri.len<th_uri_prefix.len) || - (strncasecmp(rr->nameaddr.uri.s,th_uri_prefix.s,th_uri_prefix.len)!=0)) + if (th_uri_prefix_checks + && ((rr->nameaddr.uri.len<th_uri_prefix.len) || + (strncasecmp(rr->nameaddr.uri.s,th_uri_prefix.s, + th_uri_prefix.len)!=0))) { - LM_DBG("rr %d is not encoded: [%.*s]",i,rr->nameaddr.uri.len,rr->nameaddr.uri.s); + LM_DBG("rr %d is not encoded: [%.*s]", i, + rr->nameaddr.uri.len, rr->nameaddr.uri.s); rr = rr->next; continue; } @@ -736,8 +740,9 @@ int th_unmask_ruri(sip_msg_t *msg) str out; /* Do nothing if ruri is not encoded */ - if ((REQ_LINE(msg).uri.len<th_uri_prefix.len) || - (strncasecmp(REQ_LINE(msg).uri.s,th_uri_prefix.s,th_uri_prefix.len)!=0)) + if (th_uri_prefix_checks && ((REQ_LINE(msg).uri.len<th_uri_prefix.len) || + (strncasecmp(REQ_LINE(msg).uri.s, th_uri_prefix.s, + th_uri_prefix.len)!=0))) { LM_DBG("ruri [%.*s] is not encoded",REQ_LINE(msg).uri.len,REQ_LINE(msg).uri.s); return 0; @@ -798,8 +803,8 @@ int th_unmask_refer_to(sip_msg_t *msg) uri = &(get_refer_to(msg)->uri); /* Do nothing if refer_to is not encoded */ - if ((uri->len<th_uri_prefix.len) - || (strncasecmp(uri->s, th_uri_prefix.s, th_uri_prefix.len)!=0)) + if (th_uri_prefix_checks && ((uri->len<th_uri_prefix.len) + || (strncasecmp(uri->s, th_uri_prefix.s, th_uri_prefix.len)!=0))) { LM_DBG("refer-to [%.*s] is not encoded",uri->len,uri->s); return 0; diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 91a1b7f29c..164087592a 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -77,9 +77,11 @@ str th_uri_prefix = {0, 0}; int th_param_mask_callid = 0; int th_sanity_checks = 0; -sanity_api_t scb; +int th_uri_prefix_checks = 0; int th_mask_addr_myself = 0; +sanity_api_t scb; + int th_msg_received(sr_event_param_t *evp); int th_msg_sent(sr_event_param_t *evp); int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp); @@ -101,6 +103,7 @@ static param_export_t params[]={ {"vparam_prefix", PARAM_STR, &th_vparam_prefix}, {"callid_prefix", PARAM_STR, &th_callid_prefix}, {"sanity_checks", PARAM_INT, &th_sanity_checks}, + {"uri_prefix_checks", PARAM_INT, &th_uri_prefix_checks}, {"event_callback", PARAM_STR, &_th_eventrt_callback}, {0,0,0} };

1 0

[kamailio/kamailio] wrong callback type after asynchronous SAR to HSS (distinct PSI) (#1160)
by christoph-v 24 Jun '17

24 Jun '17

### Description 1) I used kamailio as an scscf (based on the configuration files from kamailio/examples/scscf) 2) I did some changes according to my needs 3) I did some Basic tests - the results were satisfying --> OK 4) I configured a distinct PSI on the HSS (sip:04321234501@vict-ims.net) --> OK 5) I registered some user from a Zoiper Client --> OK 6) I told zoiper to call sip:04321234501@vict-ims.net --> I received 555 AS Contacting Failed - iFC terminated dialog ### Troubleshooting The SIP Response 555...... is misleading, in the WITH_DEBUG Logs we can see, the ims_isc module cannot deliver the INVITE message to the AS, because it "thinks", we are in an "on_failure" route, but the asynchronous SAR to the HSS was sent in an "request" route. File 2017_06_20_distinct_psi_03_scscf_kamailio.log: Line 642 - 660: Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: INFO: ims_registrar_scscf [cxdx_avp.c:138]: cxdx_get_avp(): cxdx_get_experimental_result_code: Failed finding avp Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: INFO: ims_registrar_scscf [cxdx_sar.c:84]: create_return_code(): created AVP successfully : [saa_return_code] - [1] Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=127 a=26 n=xlog Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=143 a=21 n=switch Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=130 a=26 n=xlog Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=131 a=5 n=route Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=673 a=26 n=xlog Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=675 a=24 n=t_newtran Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: tm [tm.c:1316]: w_t_newtran(): ERROR: t_newtran: transaction already in process 0x7ff2a6e66a58 Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=677 a=25 n=set_dlg_profile Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=692 a=16 n=if Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=685 a=25 n=is_method Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=686 a=63 n=assign Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=687 a=63 n=assign Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=688 a=24 n=record_route Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=698 a=16 n=if Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=692 a=26 n=isc_match_filter Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: INFO: ims_isc [mod.c:233]: isc_match_filter(): Checking triggers Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: CRITICAL: ims_isc [mod.c:284]: isc_match_filter(): SKIP: 0 Root cause must be found in TM module in file t_suspend.c in function t_continue(), where the type of the Routing block, that was suspended is written to the type of the new Routing block: line 214 - 229 /* which route block type were we in when we were suspended */ cb_type = FAILURE_CB_TYPE; switch (t->async_backup.backup_route) { case REQUEST_ROUTE: cb_type = **FAILURE_CB_TYPE**; <------------ this is the root cause, imho break; case FAILURE_ROUTE: cb_type = FAILURE_CB_TYPE; break; case TM_ONREPLY_ROUTE: cb_type = ONREPLY_CB_TYPE; break; case BRANCH_ROUTE: cb_type = FAILURE_CB_TYPE; break; } #### Reproduction I can help to reproduce the issue. mailto:christoph.valentin@kapsch.net Currently I have got an experimental test Setup using Zoiper Clients. After week 27 I should have simulated test cases to repeat the Scenario "per mouse-click" #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` [logs-tshark-routes_2017_06_21.zip](https://github.com/kamailio/kamailio/fil… ``` #### SIP Traffic  ``` [logs-tshark-routes_2017_06_21.zip](https://github.com/kamailio/kamailio/fil… ``` ### Possible Solutions  ### Additional Information ``` [root@vict-ims ~]# kamailio -v version: kamailio 4.4.5 (x86_64/linux) b0945e-dirty flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: b0945e -dirty compiled on 20:06:13 Jun 7 2017 with gcc 4.8.5 [root@vict-ims ~]# ``` * **Operating System**:  ``` [root@vict-ims ~]# uname -a Linux vict-ims 3.10.0-229.el7.x86_64 #1 SMP Thu Jan 29 18:37:38 EST 2015 x86_64 x86_64 x86_64 GNU/Linux [root@vict-ims ~]# ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1160

2 3

git:master:da07cc8c: pv: coherent whitespacing and indentation for pv time code
by Daniel-Constantin Mierla 24 Jun '17

24 Jun '17

Module: kamailio Branch: master Commit: da07cc8c724724d89dfe02bbe8a980f241afc582 URL: https://github.com/kamailio/kamailio/commit/da07cc8c724724d89dfe02bbe8a980f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-24T08:18:18+02:00 pv: coherent whitespacing and indentation for pv time code --- Modified: src/modules/pv/pv_time.c --- Diff: https://github.com/kamailio/kamailio/commit/da07cc8c724724d89dfe02bbe8a980f… Patch: https://github.com/kamailio/kamailio/commit/da07cc8c724724d89dfe02bbe8a980f… --- diff --git a/src/modules/pv/pv_time.c b/src/modules/pv/pv_time.c index 094b301d2d..4414b09ac9 100644 --- a/src/modules/pv/pv_time.c +++ b/src/modules/pv/pv_time.c @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -40,7 +40,7 @@ int pv_parse_time_name(pv_spec_p sp, str *in) switch(in->len) { - case 3: + case 3: if(strncmp(in->s, "sec", 3)==0) sp->pvp.pvn.u.isname.name.n = 0; else if(strncmp(in->s, "min", 3)==0) @@ -49,7 +49,7 @@ int pv_parse_time_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 4; else goto error; break; - case 4: + case 4: if(strncmp(in->s, "hour", 4)==0) sp->pvp.pvn.u.isname.name.n = 2; else if(strncmp(in->s, "mday", 4)==0) @@ -62,7 +62,7 @@ int pv_parse_time_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 7; else goto error; break; - case 5: + case 5: if(strncmp(in->s, "isdst", 5)==0) sp->pvp.pvn.u.isname.name.n = 8; else goto error; @@ -145,27 +145,31 @@ int get_time(struct sip_msg *msg, pv_param_t *param, switch(param->pvn.u.isname.name.n) { case 1: - return pv_get_uintval(msg, param, res, (unsigned int)_cfgutils_ts->tm_min); + return pv_get_uintval(msg, param, res, + (unsigned int)_cfgutils_ts->tm_min); case 2: - return pv_get_uintval(msg, param, res, (unsigned int)_cfgutils_ts->tm_hour); + return pv_get_uintval(msg, param, res, + (unsigned int)_cfgutils_ts->tm_hour); case 3: - return pv_get_uintval(msg, param, res, (unsigned int)_cfgutils_ts->tm_mday); + return pv_get_uintval(msg, param, res, + (unsigned int)_cfgutils_ts->tm_mday); case 4: - return pv_get_uintval(msg, param, res, + return pv_get_uintval(msg, param, res, (unsigned int)(_cfgutils_ts->tm_mon+1)); case 5: return pv_get_uintval(msg, param, res, (unsigned int)(_cfgutils_ts->tm_year+1900)); case 6: - return pv_get_uintval(msg, param, res, + return pv_get_uintval(msg, param, res, (unsigned int)(_cfgutils_ts->tm_wday+1)); case 7: - return pv_get_uintval(msg, param, res, + return pv_get_uintval(msg, param, res, (unsigned int)(_cfgutils_ts->tm_yday+1)); case 8: return pv_get_sintval(msg, param, res, _cfgutils_ts->tm_isdst); default: - return pv_get_uintval(msg, param, res, (unsigned int)_cfgutils_ts->tm_sec); + return pv_get_uintval(msg, param, res, + (unsigned int)_cfgutils_ts->tm_sec); } } @@ -243,7 +247,7 @@ int pv_get_timenowf(struct sip_msg *msg, pv_param_t *param, { str s; time_t t; - + t = time(NULL); s.s = ctime(&t); s.len = strlen(s.s)-1; @@ -265,12 +269,12 @@ int pv_get_timef(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str s; - + if(msg==NULL) return -1; msg_set_time(msg); - + s.s = ctime(&msg->tval.tv_sec); s.len = strlen(s.s)-1; return pv_get_strintval(msg, param, res, &s, (int)msg->tval.tv_sec); @@ -363,5 +367,3 @@ int pv_parse_timeval_name(pv_spec_p sp, str *in) LM_ERR("unknown PV timeval name %.*s\n", in->len, in->s); return -1; } - -

1 0

git:master:13f34f0e: htable: removed useless mode param from ht_cell_value_add()
by Daniel-Constantin Mierla 24 Jun '17

24 Jun '17

Module: kamailio Branch: master Commit: 13f34f0effc936030baf82bbdd10285b98d6d790 URL: https://github.com/kamailio/kamailio/commit/13f34f0effc936030baf82bbdd10285… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-24T08:18:18+02:00 htable: removed useless mode param from ht_cell_value_add() - it was used only once with mode=1 --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/13f34f0effc936030baf82bbdd10285… Patch: https://github.com/kamailio/kamailio/commit/13f34f0effc936030baf82bbdd10285… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 03aee19a72..9d066eb999 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -641,8 +641,7 @@ int ht_del_cell(ht_t *ht, str *name) return 0; } -ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, - ht_cell_t *old) +ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, ht_cell_t *old) { unsigned int idx; unsigned int hid; @@ -661,7 +660,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, if(ht->htexpire>0) now = time(NULL); prev = NULL; - if(mode) ht_slot_lock(ht, idx); + ht_slot_lock(ht, idx); it = ht->entries[idx].first; while(it!=NULL && it->cellid < hid) { @@ -683,7 +682,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, it->value.n = ht->initval.n; /* increment will be done below */ } else { - if(mode) ht_slot_unlock(ht, idx); + ht_slot_unlock(ht, idx); return NULL; } } @@ -691,7 +690,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, if(it->flags&AVP_VAL_STR) { /* string value cannot be incremented */ - if(mode) ht_slot_unlock(ht, idx); + ht_slot_unlock(ht, idx); return NULL; } else { it->value.n += val; @@ -702,7 +701,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, if(old->msize>=it->msize) { memcpy(old, it, it->msize); - if(mode) ht_slot_unlock(ht, idx); + ht_slot_unlock(ht, idx); return old; } } @@ -710,7 +709,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, if(cell!=NULL) memcpy(cell, it, it->msize); - if(mode) ht_slot_unlock(ht, idx); + ht_slot_unlock(ht, idx); return cell; } } @@ -720,7 +719,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, /* add val if htable has an integer init value */ if(ht->flags!=PV_VAL_INT) { - if(mode) ht_slot_unlock(ht, idx); + ht_slot_unlock(ht, idx); return NULL; } isval.n = ht->initval.n + val; @@ -728,7 +727,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, if(it == NULL) { LM_ERR("cannot create new cell.\n"); - if(mode) ht_slot_unlock(ht, idx); + ht_slot_unlock(ht, idx); return NULL; } it->expire = now + ht->htexpire; @@ -753,7 +752,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, if(old->msize>=it->msize) { memcpy(old, it, it->msize); - if(mode) ht_slot_unlock(ht, idx); + ht_slot_unlock(ht, idx); return old; } } @@ -761,7 +760,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, if(cell!=NULL) memcpy(cell, it, it->msize); - if(mode) ht_slot_unlock(ht, idx); + ht_slot_unlock(ht, idx); return cell; } diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index d64b68ac95..c9bbd68c94 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -91,8 +91,7 @@ int ht_init_tables(void); int ht_destroy(void); int ht_set_cell(ht_t *ht, str *name, int type, int_str *val, int mode); int ht_del_cell(ht_t *ht, str *name); -ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, - ht_cell_t *old); +ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, ht_cell_t *old); int ht_dbg(void); ht_cell_t* ht_cell_pkg_copy(ht_t *ht, str *name, ht_cell_t *old); diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index 2713f41ddd..9ef26a9e7e 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -331,7 +331,7 @@ int pv_get_ht_add(struct sip_msg *msg, pv_param_t *param, LM_ERR("cannot get $sht name\n"); return -1; } - htc = ht_cell_value_add(hpv->ht, &htname, val, 1, _htc_local); + htc = ht_cell_value_add(hpv->ht, &htname, val, _htc_local); if(_htc_local!=htc) { ht_cell_pkg_free(_htc_local);

1 0

git:master:8ce1bcd5: htable: map $shtrecord() inner names over integer ids
by Daniel-Constantin Mierla 24 Jun '17

24 Jun '17

Module: kamailio Branch: master Commit: 8ce1bcd52cd5117f920acce5f78683e974d4a3a4 URL: https://github.com/kamailio/kamailio/commit/8ce1bcd52cd5117f920acce5f78683e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-24T08:18:18+02:00 htable: map $shtrecord() inner names over integer ids - avoid string comparison at runtime --- Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/8ce1bcd52cd5117f920acce5f78683e… Patch: https://github.com/kamailio/kamailio/commit/8ce1bcd52cd5117f920acce5f78683e… --- diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index c928bf1b49..2713f41ddd 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -368,49 +368,57 @@ int pv_get_ht_dec(struct sip_msg *msg, pv_param_t *param, int pv_parse_ht_expired_cell(pv_spec_t *sp, str *in) { - if ((in->len != 3 || strncmp(in->s, "key", in->len) != 0) && - (in->len != 5 || strncmp(in->s, "value", in->len) != 0)) - { + if(sp==NULL || in==NULL || in->len<=0) return -1; + switch(in->len) + { + case 3: + if(strncmp(in->s, "key", in->len)==0) { + sp->pvp.pvn.u.isname.name.n = 0; + } else { + goto error; + } + break; + case 5: + if(strncmp(in->s, "value", in->len)==0) { + sp->pvp.pvn.u.isname.name.n = 1; + } else { + goto error; + } + break; + default: + goto error; } - - sp->pvp.pvn.u.isname.name.s.s = in->s; - sp->pvp.pvn.u.isname.name.s.len = in->len; sp->pvp.pvn.u.isname.type = 0; sp->pvp.pvn.type = PV_NAME_INTSTR; return 0; + +error: + LM_ERR("unknown pv name %.*s\n", in->len, in->s); + return -1; } int pv_get_ht_expired_cell(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - if (res == NULL || ht_expired_cell == NULL) - { + if (res == NULL || ht_expired_cell == NULL) { return -1; } - if (param->pvn.u.isname.name.s.len == 3 && - strncmp(param->pvn.u.isname.name.s.s, "key", 3) == 0) - { - res->rs = ht_expired_cell->name; - } - else if (param->pvn.u.isname.name.s.len == 5 && - strncmp(param->pvn.u.isname.name.s.s, "value", 5) == 0) + switch(param->pvn.u.isname.name.n) { - if(ht_expired_cell->flags&AVP_VAL_STR) { - return pv_get_strval(msg, param, res, &ht_expired_cell->value.s); - } else { - return pv_get_sintval(msg, param, res, ht_expired_cell->value.n); - } + case 0: + return pv_get_strval(msg, param, res, &ht_expired_cell->name); + case 1: + if(ht_expired_cell->flags&AVP_VAL_STR) { + return pv_get_strval(msg, param, res, &ht_expired_cell->value.s); + } else { + return pv_get_sintval(msg, param, res, ht_expired_cell->value.n); + } + default: + return pv_get_null(msg, param, res); } - - if (res->rs.s == NULL) - res->flags = PV_VAL_NULL; - else - res->flags = PV_VAL_STR; - - return 0; } int pv_parse_iterator_name(pv_spec_t *sp, str *in)

1 0

list of listeners with ports and advertisements
by Luis Azedo 24 Jun '17

24 Jun '17

Hi, i don't think we can access this info at runtime from the script and i was thinking of implementing it. we have a timer proc that runs a script block and we need to access this info from that script. i'm think in adding a (maybe configurable name?) xavp with that info that would be available (only needs to evaluate once since listeners are not dynamic) what would be the best module to put this ? pv ? Thanks

2 1

git:master:f18da4c9: kazoo: use hardcoded max size of routing key
by lazedo 23 Jun '17

23 Jun '17

Module: kamailio Branch: master Commit: f18da4c9d6cc8d1ab061d68cbd8e9d988ebf2be6 URL: https://github.com/kamailio/kamailio/commit/f18da4c9d6cc8d1ab061d68cbd8e9d9… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-06-23T21:18:13+01:00 kazoo: use hardcoded max size of routing key --- Modified: src/modules/kazoo/defs.h Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/f18da4c9d6cc8d1ab061d68cbd8e9d9… Patch: https://github.com/kamailio/kamailio/commit/f18da4c9d6cc8d1ab061d68cbd8e9d9…

1 0

git:master:56e07cf2: kazoo: max size of routing key
by lazedo 23 Jun '17

23 Jun '17

Module: kamailio Branch: master Commit: 56e07cf2bb281d0aa78517e919055de640468020 URL: https://github.com/kamailio/kamailio/commit/56e07cf2bb281d0aa78517e919055de… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-06-23T21:09:54+01:00 kazoo: max size of routing key --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/56e07cf2bb281d0aa78517e919055de… Patch: https://github.com/kamailio/kamailio/commit/56e07cf2bb281d0aa78517e919055de…

1 0

[kamailio/kamailio] presence: subsription double delete fix (#1163)
by Dmitri Savolainen 23 Jun '17

23 Jun '17

i have timeout_rm_subs=1 (as default) and It was a lot of messages in kamailio.log like this `Jun 23 12:08:56 kamailio[8366] ERROR: presence [subscribe.c:487]: delete_subs(): Failed to delete subscription from memory [slot: 255 ev: sip:2579*109@host pu: presence ci: 08f29987584a4e47b12110ff09e48d92 ft: 8fece9a08beb407cb0fec4c703e6f99e tt: 302fa4d0674d106ffe861f2ef3364869.711a]` The reason is timout NOTIFY with "Subscription-State: terminated;reason=timeout" You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1163 -- Commit Summary -- * presence: subsription double delete fix -- File Changes -- M src/modules/presence/notify.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1163.patch https://github.com/kamailio/kamailio/pull/1163.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1163

2 2

git:master:1b56c964: Merge pull request #1163 from snen/presence_subcribe_delete_error
by GitHub 23 Jun '17

23 Jun '17

Module: kamailio Branch: master Commit: 1b56c96487d0788a0cbb21da71589f7d8314e7f8 URL: https://github.com/kamailio/kamailio/commit/1b56c96487d0788a0cbb21da71589f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-06-23T19:12:38+02:00 Merge pull request #1163 from snen/presence_subcribe_delete_error presence: subsription double delete fix --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/1b56c96487d0788a0cbb21da71589f7… Patch: https://github.com/kamailio/kamailio/commit/1b56c96487d0788a0cbb21da71589f7… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index e5cd1cdf42..63307c7e2e 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1847,7 +1847,7 @@ void p_tm_callback( struct cell *t, int type, struct tmcb_params *ps) if(ps->code == 404 || ps->code == 481 - || (ps->code == 408 && timeout_rm_subs) + || (ps->code == 408 && timeout_rm_subs && subs->status != TERMINATED_STATUS) || pres_get_delete_sub()) { delete_subs(&subs->pres_uri, &subs->event->name, &subs->to_tag, &subs->from_tag, &subs->callid);

1 0

git:master:8e185ddf: presence: subsription double delete fix
by Dmitri Savolainen 23 Jun '17

23 Jun '17

Module: kamailio Branch: master Commit: 8e185ddf8e81af8d6283a87ec95116965235752a URL: https://github.com/kamailio/kamailio/commit/8e185ddf8e81af8d6283a87ec951169… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2017-06-23T18:57:00+03:00 presence: subsription double delete fix - if timeout_rm_subs parameter set to "1" and NOTIFY timeout about expired subsription --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/8e185ddf8e81af8d6283a87ec951169… Patch: https://github.com/kamailio/kamailio/commit/8e185ddf8e81af8d6283a87ec951169… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index e5cd1cdf42..63307c7e2e 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1847,7 +1847,7 @@ void p_tm_callback( struct cell *t, int type, struct tmcb_params *ps) if(ps->code == 404 || ps->code == 481 - || (ps->code == 408 && timeout_rm_subs) + || (ps->code == 408 && timeout_rm_subs && subs->status != TERMINATED_STATUS) || pres_get_delete_sub()) { delete_subs(&subs->pres_uri, &subs->event->name, &subs->to_tag, &subs->from_tag, &subs->callid);

1 0

git:master:4514c918: htable: do not call expired event route on get/add operations
by Daniel-Constantin Mierla 23 Jun '17

23 Jun '17

Module: kamailio Branch: master Commit: 4514c91883d67ee062582aed7b414633609cf6ac URL: https://github.com/kamailio/kamailio/commit/4514c91883d67ee062582aed7b41463… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-23T18:25:32+02:00 htable: do not call expired event route on get/add operations - have consistent behaviour with set operation - avoid accessing the same (expired) item twice, second after being removed if the item is accessed in the event route - reported by GH #1152 --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/4514c91883d67ee062582aed7b41463… Patch: https://github.com/kamailio/kamailio/commit/4514c91883d67ee062582aed7b41463… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 1bbd079b30..03aee19a72 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -676,7 +676,6 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, /* found */ if(now>0 && it->expire!=0 && it->expire<now) { /* entry has expired */ - ht_handle_expired_record(ht, it); if(ht->flags==PV_VAL_INT) { /* initval is integer, use it to create a fresh entry */ @@ -684,16 +683,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, it->value.n = ht->initval.n; /* increment will be done below */ } else { - /* delete expired entry */ - if(it->prev==NULL) - ht->entries[idx].first = it->next; - else - it->prev->next = it->next; - if(it->next) - it->next->prev = it->prev; - ht->entries[idx].esize--; if(mode) ht_slot_unlock(ht, idx); - ht_cell_free(it); return NULL; } } @@ -804,18 +794,8 @@ ht_cell_t* ht_cell_pkg_copy(ht_t *ht, str *name, ht_cell_t *old) { /* found */ if(ht->htexpire>0 && it->expire!=0 && it->expire<time(NULL)) { - /* entry has expired, delete it and return NULL */ - ht_handle_expired_record(ht, it); - - if(it->prev==NULL) - ht->entries[idx].first = it->next; - else - it->prev->next = it->next; - if(it->next) - it->next->prev = it->prev; - ht->entries[idx].esize--; + /* entry has expired, return NULL */ ht_slot_unlock(ht, idx); - ht_cell_free(it); return NULL; } if(old!=NULL) diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index 522811da58..c928bf1b49 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -91,7 +91,9 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, if((val==NULL) || (val->flags&PV_VAL_NULL)) { /* delete it */ - if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_DEL_CELL, &hpv->htname, &htname, 0, NULL, 0)!=0) { + if (hpv->ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_DEL_CELL, &hpv->htname, + &htname, 0, NULL, 0)!=0) { LM_ERR("dmq relication failed\n"); } ht_del_cell(hpv->ht, &htname); @@ -101,7 +103,9 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, if(val->flags&PV_TYPE_INT) { isval.n = val->ri; - if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, &htname, 0, &isval, 1)!=0) { + if (hpv->ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, + &htname, 0, &isval, 1)!=0) { LM_ERR("dmq relication failed\n"); } if(ht_set_cell(hpv->ht, &htname, 0, &isval, 1)!=0) @@ -111,7 +115,9 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, } } else { isval.s = val->rs; - if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, &htname, AVP_VAL_STR, &isval, 1)!=0) { + if (hpv->ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, + &htname, AVP_VAL_STR, &isval, 1)!=0) { LM_ERR("dmq relication failed\n"); } if(ht_set_cell(hpv->ht, &htname, AVP_VAL_STR, &isval, 1)!=0)

1 0

Kamailio v4.3.7 Released
by Daniel-Constantin Mierla 23 Jun '17

23 Jun '17

Hello, Kamailio SIP Server v4.3.7 stable release is out. This is a maintenance release of an old stable branch, 4.3, that includes fixes since release of v4.3.6. There is no change to database schema or configuration language structure that you have to do on installations of v4.3.x. Important note: unless some major regression is discovered in the near future, this is the latest release to be done from branch 4.3, which is no longer to be officially maintained. Therefore it is strongly advised to consider upgrading to 4.4.x or 5.0.x series. For more details about version 4.3.7 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2017/06/kamailio-v4-3-7-released/ RPM, Debian/Ubuntu packages will be available soon as well. Note: the latest stable branch is 5.0, at this moment with its latest release v5.0.2. See more details about it at: * https://www.kamailio.org/w/kamailio-v5-0-0-release-notes/ Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/miconda - http://www.linkedin.com/in/miconda

1 0

git:master:fec6764a: modules: readme files regenerated - xhttp ... [skip ci]
by Kamailio Dev 23 Jun '17

23 Jun '17

Module: kamailio Branch: master Commit: fec6764a6fae602b80b114235e8b5426fac81abc URL: https://github.com/kamailio/kamailio/commit/fec6764a6fae602b80b114235e8b542… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-23T13:16:24+02:00 modules: readme files regenerated - xhttp ... [skip ci] --- Modified: src/modules/xhttp/README --- Diff: https://github.com/kamailio/kamailio/commit/fec6764a6fae602b80b114235e8b542… Patch: https://github.com/kamailio/kamailio/commit/fec6764a6fae602b80b114235e8b542…

1 0

git:master:1abb2fb0: xhttp: fixed the docbook format
by Daniel-Constantin Mierla 23 Jun '17

23 Jun '17

Module: kamailio Branch: master Commit: 1abb2fb0e05b90128a4be4314d5845ce3c1dee66 URL: https://github.com/kamailio/kamailio/commit/1abb2fb0e05b90128a4be4314d5845c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-23T13:11:25+02:00 xhttp: fixed the docbook format --- Modified: src/modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1abb2fb0e05b90128a4be4314d5845c… Patch: https://github.com/kamailio/kamailio/commit/1abb2fb0e05b90128a4be4314d5845c… --- diff --git a/src/modules/xhttp/doc/xhttp_admin.xml b/src/modules/xhttp/doc/xhttp_admin.xml index 79043cd4ad..c2a18f9d44 100644 --- a/src/modules/xhttp/doc/xhttp_admin.xml +++ b/src/modules/xhttp/doc/xhttp_admin.xml @@ -183,6 +183,9 @@ function ksr_xhttp_event(evname) return 1; end ... +</programlisting> + </example> + </section> </section> <section>

1 0

git:4.3:78868488: ChangeLog: content updated for v4.3.7
by Daniel-Constantin Mierla 23 Jun '17

23 Jun '17

Module: kamailio Branch: 4.3 Commit: 78868488f8c6f16b62beb5633d903e685e54c37a URL: https://github.com/kamailio/kamailio/commit/78868488f8c6f16b62beb5633d903e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-23T12:54:19+02:00 ChangeLog: content updated for v4.3.7 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/78868488f8c6f16b62beb5633d903e6… Patch: https://github.com/kamailio/kamailio/commit/78868488f8c6f16b62beb5633d903e6…

1 0

git:4.3:4301d7fb: Makefile.defs: version set to 4.3.7
by Daniel-Constantin Mierla 23 Jun '17

23 Jun '17

Module: kamailio Branch: 4.3 Commit: 4301d7fb6d6045d9588cd5f1026813ba7b14d06c URL: https://github.com/kamailio/kamailio/commit/4301d7fb6d6045d9588cd5f1026813b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-23T12:43:11+02:00 Makefile.defs: version set to 4.3.7 --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/4301d7fb6d6045d9588cd5f1026813b… Patch: https://github.com/kamailio/kamailio/commit/4301d7fb6d6045d9588cd5f1026813b… --- diff --git a/Makefile.defs b/Makefile.defs index bc358e55e7..dcfa058a6b 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -96,7 +96,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 4 PATCHLEVEL = 3 -SUBLEVEL = 6 +SUBLEVEL = 7 EXTRAVERSION = # memory manager switcher

1 0

git:4.3:019bb934: pkg/kamailio/deb: update version to 4.3.7
by Daniel-Constantin Mierla 23 Jun '17

23 Jun '17

Module: kamailio Branch: 4.3 Commit: 019bb93431778395f6f000353fb2eaa29827c6d4 URL: https://github.com/kamailio/kamailio/commit/019bb93431778395f6f000353fb2eaa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-23T12:42:16+02:00 pkg/kamailio/deb: update version to 4.3.7 --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/squeeze/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog --- Diff: https://github.com/kamailio/kamailio/commit/019bb93431778395f6f000353fb2eaa… Patch: https://github.com/kamailio/kamailio/commit/019bb93431778395f6f000353fb2eaa… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 3e36bf399a..6910197f62 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.7) unstable; urgency=medium + + * update version to 4.3.7 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 23 Jun 2016 12:30:20 +0200 + kamailio (4.3.6) unstable; urgency=medium * update version to 4.3.6 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 3e36bf399a..6910197f62 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.7) unstable; urgency=medium + + * update version to 4.3.7 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 23 Jun 2016 12:30:20 +0200 + kamailio (4.3.6) unstable; urgency=medium * update version to 4.3.6 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 3e36bf399a..6910197f62 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.7) unstable; urgency=medium + + * update version to 4.3.7 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 23 Jun 2016 12:30:20 +0200 + kamailio (4.3.6) unstable; urgency=medium * update version to 4.3.6 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index 3e36bf399a..6910197f62 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.7) unstable; urgency=medium + + * update version to 4.3.7 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 23 Jun 2016 12:30:20 +0200 + kamailio (4.3.6) unstable; urgency=medium * update version to 4.3.6 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 3e36bf399a..6910197f62 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.7) unstable; urgency=medium + + * update version to 4.3.7 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 23 Jun 2016 12:30:20 +0200 + kamailio (4.3.6) unstable; urgency=medium * update version to 4.3.6 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 3e36bf399a..6910197f62 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.7) unstable; urgency=medium + + * update version to 4.3.7 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 23 Jun 2016 12:30:20 +0200 + kamailio (4.3.6) unstable; urgency=medium * update version to 4.3.6

1 0

[kamailio/kamailio] app_lua: add "NOTICE" loglevel to sr.log (#1162)
by Sebastian Damm 23 Jun '17

23 Jun '17

The "notice" loglevel is missing in app_lua's sr.log function. This patch adds it. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1162 -- Commit Summary -- * app_lua: add "NOTICE" loglevel to sr.log -- File Changes -- M src/modules/app_lua/app_lua_sr.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1162.patch https://github.com/kamailio/kamailio/pull/1162.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1162

2 4

git:4.3:32a82b78: pkg/rpm: version set to 4.3.7 in spec files
by Daniel-Constantin Mierla 23 Jun '17

23 Jun '17

Module: kamailio Branch: 4.3 Commit: 32a82b7849f35375fb89595f7a6c1c987b3e613f URL: https://github.com/kamailio/kamailio/commit/32a82b7849f35375fb89595f7a6c1c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-23T11:24:36+02:00 pkg/rpm: version set to 4.3.7 in spec files --- Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE --- Diff: https://github.com/kamailio/kamailio/commit/32a82b7849f35375fb89595f7a6c1c9… Patch: https://github.com/kamailio/kamailio/commit/32a82b7849f35375fb89595f7a6c1c9… --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 6e10af185f..8d924f6d6e 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.3.6 +%define ver 4.3.7 %define rel 0.0%{dist} diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index 0332180934..3a96a884b2 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.3.6 +%define ver 4.3.7 %define rel 0%{dist} diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 3f7fab2d14..555fed1a0e 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.3.6 +%define ver 4.3.7 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index 433e218d22..c1814229ba 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.3.6 +%define ver 4.3.7 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

git:5.0:7f477020: app_lua: add "NOTICE" loglevel to sr.log
by Daniel-Constantin Mierla 23 Jun '17

23 Jun '17

Module: kamailio Branch: 5.0 Commit: 7f477020368b0f42bfd053f8eb02441b323a610f URL: https://github.com/kamailio/kamailio/commit/7f477020368b0f42bfd053f8eb02441… Author: Sebastian Damm <damm(a)sipgate.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-23T11:08:37+02:00 app_lua: add "NOTICE" loglevel to sr.log (cherry picked from commit c2a27bc0875aaaec877c75e9b50fbf41011918b1) --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/7f477020368b0f42bfd053f8eb02441… Patch: https://github.com/kamailio/kamailio/commit/7f477020368b0f42bfd053f8eb02441… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index d23ddaca70..f999de3e37 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -96,6 +96,8 @@ static int lua_sr_log (lua_State *L) LM_DBG("%s", txt); } else if(strcasecmp(level, "info")==0) { LM_INFO("%s", txt); + } else if(strcasecmp(level, "notice")==0) { + LM_NOTICE("%s", txt); } else if(strcasecmp(level, "warn")==0) { LM_WARN("%s", txt); } else if(strcasecmp(level, "crit")==0) {

1 0

Releasing Kamailio v4.3.7
by Daniel-Constantin Mierla 23 Jun '17

23 Jun '17

Hello, I am planning to release Kamailio v4.3.7 very soon, likely tomorrow, based on the last version of branch 4.3. This should mark the end of official maintenance for branch 4.3, so if no major regression discovered in following few weeks, it will be the last release in 4.3 series. If there is something you know it needs to be pushed in branch 4.3, write back to mailing list. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - www.kamailioworld.com

1 1

[kamailio/kamailio] IPv6 parse_uri error (#1136)
by davidxbwang 22 Jun '17

22 Jun '17

### Description  When making end-to-end IMS voice call over IPv6, Kamailio PCSCF doesn't send the Sip Invite to callee. I saw the following error in PCSCF logs: 4(32107) DEBUG: <core> [parser/parse_uri.c:1258]: parse_uri(): parse_uri: bad char ':' in state 2 parsed: <sip:FC00:1234> (13) / <sip:FC00:1234:3:2:0:0:0:0:5060> (30) 4(32107) ERROR: tm [ut.h:254]: uri2dst2(): ERROR: uri2dst: bad_uri: [sip:FC00:1234:3:2:0:0:0:0:5060] 4(32107) ERROR: tm [t_fwd.c:1737]: t_forward_nonack(): ERROR: t_forward_nonack: failure to add branches 4(32107) DEBUG: tm [t_funcs.c:331]: t_relay_to(): t_forward_nonack returned error -478 (-478) 4(32107) DEBUG: tm [t_funcs.c:348]: t_relay_to(): -478 error reply generation delayed I saw a similar issue in your database: nat_traversal: Builds wrong URI for IPv6, bad URI parsing #362. Have you fixed this issue? ### Troubleshooting To me, sip:FC00:1234:3:2:0:0:0:0:5060 should be sip:[FC00:1234:3:2:0:0:0:0]:5060. After I added the workarround to change it to sip:[FC00:1234:3:2:0:0:0:0]:5060, PCSCF can send the Sip Invite to callee and the IMS voice call can be established. #### Reproduction  I can reproduce this issue using two soft phones: Linphone and Jitsi. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` 4(32107) DEBUG: <core> [parser/parse_uri.c:1258]: parse_uri(): parse_uri: bad char ':' in state 2 parsed: <sip:FC00:1234> (13) / <sip:FC00:1234:3:2:0:0:0:0:5060> (30) 4(32107) ERROR: tm [ut.h:254]: uri2dst2(): ERROR: uri2dst: bad_uri: [sip:FC00:1234:3:2:0:0:0:0:5060] 4(32107) ERROR: tm [t_fwd.c:1737]: t_forward_nonack(): ERROR: t_forward_nonack: failure to add branches 4(32107) DEBUG: tm [t_funcs.c:331]: t_relay_to(): t_forward_nonack returned error -478 (-478) 4(32107) DEBUG: tm [t_funcs.c:348]: t_relay_to(): -478 error reply generation delayed #### SIP Traffic  ``` (paste your sip traffic here) ``` INVITE sip:bob@[fc00:1234:3:2:0:0:0:0]:5060;transport=udp;registering_acc=ims_mnc001_mcc001_3gppnetwork_org SIP/2.0 Record-Route: <sip:mt@[FC00:1234:1:0:0:0:0:47];lr=on;ftag=be2790bd;did=557.1972> Route: <sip:term@pcscf.ims.mnc001.mcc001.3gppnetwork.org:5060;nat=yes;received=sip:FC00:1234:3:2:0:0:0:0:5060;lr> Record-Route: <sip:mo@[FC00:1234:1:0:0:0:0:47];lr=on;ftag=be2790bd;did=557.1972> Record-Route: <sip:mo@[FC00:1234:1:0:0:0:0:45];lr=on;ftag=be2790bd;nat=yes;did=557.f271> Call-ID: 16a983b6edc2370ad08370112a800d98@0:0:0:0:0:0:0:0 CSeq: 1 INVITE From: "alice" <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=be2790bd To: <sip:bob@ims.mnc001.mcc001.3gppnetwork.org> Via: SIP/2.0/UDP [FC00:1234:1:0:0:0:0:47];branch=z9hG4bKc87.6294094b4129fdf733069ffd6625d303.0 Via: SIP/2.0/UDP [FC00:1234:1:0:0:0:0:46];branch=z9hG4bKc87.66958ffdcce62f80024bf5913086e312.1 Via: SIP/2.0/UDP [FC00:1234:1:0:0:0:0:47];branch=z9hG4bKc87.5d9a7aae58830978432d73b25057fb39.0 Via: SIP/2.0/UDP [FC00:1234:1:0:0:0:0:45];branch=z9hG4bKc87.b56bcd8f177f65d2b1ec20ccca46519a.0 Via: SIP/2.0/UDP [fc00:1234:3:1:0:0:0:0]:5060;rport=5060;branch=z9hG4bK-363237-5db2dc2ac95e17a0c589ae29eb75a0ce Max-Forwards: 66 Contact: "alice" <sip:alice@[fc00:1234:3:1:0:0:0:0]:5060;transport=udp;registering_acc=ims_mnc001_mcc001_3gppnetwork_org> User-Agent: Jitsi2.10.5550Linux Content-Type: application/sdp Content-Length: 910 X-RTP: mo P-Asserted-Identity: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> v=0 o=alice-jitsi.org 0 0 IN IP6 fc00:1234:3:1:0:0:0:0 s=- c=IN IP6 fc00:1234:3:1:0:0:0:0 t=0 0 m=audio 5056 RTP/AVP 96 97 98 9 100 102 0 8 103 3 104 101 a=rtpmap:96 opus/48000/2 a=fmtp:96 usedtx=1 a=ptime:20 a=rtpmap:97 SILK/24000 a=rtpmap:98 SILK/16000 a=rtpmap:9 G722/8000 a=rtpmap:100 speex/32000 a=rtpmap:102 speex/16000 a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:103 iLBC/8000 a=rtpmap:3 GSM/8000 a=rtpmap:104 speex/8000 a=rtpmap:101 telephone-event/8000 a=extmap:1 urn:ietf:params:rtp-hdrext:csrc-audio-level a=extmap:2 urn:ietf:params:rtp-hdrext:ssrc-audio-level a=rtcp-xr:voip-metrics m=video 5058 RTP/AVP 105 99 a=recvonly a=rtpmap:105 H264/90000 a=fmtp:105 profile-level-id=4DE01f;packetization-mode=1 a=imageattr:105 send * recv [x=[1:1376],y=[1:883]] a=rtpmap:99 H264/90000 a=fmtp:99 profile-level-id=4DE01f a=imageattr:99 send * recv [x=[1:1376],y=[1:883]] ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` version: kamailio 5.0.0-dev5 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 21:48:42 Feb 21 2017 with gcc 5.4.0 * **Operating System**:  ``` (paste your output here) ``` Distributor ID: Ubuntu Description: Ubuntu 16.04.2 LTS Release: 16.04 Codename: xenial -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1136

6 17

[kamailio/kamailio] Fix compiler warnings for unused static symbols (#1154)
by Corey Farrell 22 Jun '17

22 Jun '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1154 -- Commit Summary -- * Fix compiler warnings for unused static symbols -- File Changes -- M src/modules/carrierroute/cr_fifo.c (6) M src/modules/ims_auth/authorize.c (6) M src/modules/xhttp_pi/xhttp_pi_fnc.c (7) M src/modules/xhttp_rpc/xhttp_rpc_fnc.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1154.patch https://github.com/kamailio/kamailio/pull/1154.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1154

2 2

git:master:ff4e81eb: xhttp_rpc: removed unused static constants
by Daniel-Constantin Mierla 22 Jun '17

22 Jun '17

Module: kamailio Branch: master Commit: ff4e81eb977fbf6394cc53b4055a8b62efc5f4e4 URL: https://github.com/kamailio/kamailio/commit/ff4e81eb977fbf6394cc53b4055a8b6… Author: Corey Farrell <git(a)cfware.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-22T22:09:56+02:00 xhttp_rpc: removed unused static constants --- Modified: src/modules/xhttp_rpc/xhttp_rpc_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/ff4e81eb977fbf6394cc53b4055a8b6… Patch: https://github.com/kamailio/kamailio/commit/ff4e81eb977fbf6394cc53b4055a8b6… --- diff --git a/src/modules/xhttp_rpc/xhttp_rpc_fnc.c b/src/modules/xhttp_rpc/xhttp_rpc_fnc.c index f9fa7d9343..835a14180d 100644 --- a/src/modules/xhttp_rpc/xhttp_rpc_fnc.c +++ b/src/modules/xhttp_rpc/xhttp_rpc_fnc.c @@ -171,9 +171,6 @@ static const str XHTTP_RPC_SLASH = str_init("/"); static const str XHTTP_RPC_SEMICOLON = str_init(": "); static const str XHTTP_RPC_NODE_INDENT = str_init("\t"); -static const str XHTTP_RPC_NODE_SEPARATOR = str_init(":: "); -static const str XHTTP_RPC_ATTR_SEPARATOR = str_init(" "); -static const str XHTTP_RPC_ATTR_VAL_SEPARATOR = str_init("="); const str XHTTP_RPC_BREAK = str_init("<br/>"); static const str XHTTP_RPC_CODE_1 = str_init("<pre>"); @@ -185,12 +182,6 @@ static const str XHTTP_RPC_Post_1 = str_init("\n"\ " <input type=\"submit\" value=\"Submit\"/>\n"\ " </form>\n"); -static const str XHTTP_RPC_Post_1a = str_init("\n"\ -" <form name=\"input\" method=\"get\">\n"\ -" <textarea name=\"arg\" rows=\"2\" cols=\"60\"></textarea>\n"\ -" <input type=\"submit\" value=\"Submit\"/>\n"\ -" </form>\n"); - static const str XHTTP_RPC_Response_Foot = str_init(\ "\n</center>\n<div align=\"center\" class=\"foot\" style=\"margin:20px auto\">"\ "<span style='margin-left:5px;'></span>"\

1 0

git:master:f885de1a: xhttp_pi: removed unused static constants
by Daniel-Constantin Mierla 22 Jun '17

22 Jun '17

Module: kamailio Branch: master Commit: f885de1abcfe6ed2e981527dbbfd82f71e189be5 URL: https://github.com/kamailio/kamailio/commit/f885de1abcfe6ed2e981527dbbfd82f… Author: Corey Farrell <git(a)cfware.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-22T22:08:52+02:00 xhttp_pi: removed unused static constants --- Modified: src/modules/xhttp_pi/xhttp_pi_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/f885de1abcfe6ed2e981527dbbfd82f… Patch: https://github.com/kamailio/kamailio/commit/f885de1abcfe6ed2e981527dbbfd82f… --- diff --git a/src/modules/xhttp_pi/xhttp_pi_fnc.c b/src/modules/xhttp_pi/xhttp_pi_fnc.c index e87beef406..1a26b6dba3 100644 --- a/src/modules/xhttp_pi/xhttp_pi_fnc.c +++ b/src/modules/xhttp_pi/xhttp_pi_fnc.c @@ -345,18 +345,11 @@ static const str XHTTP_PI_Response_Menu_Cmd_Table_2 = str_init("</tbody></table> static const str XHTTP_PI_NBSP = str_init(" "); static const str XHTTP_PI_SLASH = str_init("/"); -static const str XHTTP_PI_SEMICOLON = str_init(" : "); static const str XHTTP_PI_SQUOT_GT = str_init("'>"); -static const str XHTTP_PI_NODE_INDENT = str_init("\t"); -static const str XHTTP_PI_NODE_SEPARATOR = str_init(":: "); static const str XHTTP_PI_ATTR_SEPARATOR = str_init(" "); static const str XHTTP_PI_ATTR_VAL_SEPARATOR = str_init("="); -static const str XHTTP_PI_BREAK = str_init("<br/>"); -static const str XHTTP_PI_CODE_1 = str_init("<pre>"); -static const str XHTTP_PI_CODE_2 = str_init("</pre>"); - static const str XHTTP_PI_Post_Form_1 = str_init("\n"\ " <form name=\"input\" method=\"get\">\n" " <input type=hidden name=cmd value=\"on\">\n");

1 0

git:master:cc737b9d: ims_auth: removed empty get_ha1() static function
by Daniel-Constantin Mierla 22 Jun '17

22 Jun '17

Module: kamailio Branch: master Commit: cc737b9d926aac26437ad37ba378012b60c9b494 URL: https://github.com/kamailio/kamailio/commit/cc737b9d926aac26437ad37ba378012… Author: Corey Farrell <git(a)cfware.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-22T22:07:47+02:00 ims_auth: removed empty get_ha1() static function --- Modified: src/modules/ims_auth/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/cc737b9d926aac26437ad37ba378012… Patch: https://github.com/kamailio/kamailio/commit/cc737b9d926aac26437ad37ba378012… --- diff --git a/src/modules/ims_auth/authorize.c b/src/modules/ims_auth/authorize.c index 3b13a06565..260c65085e 100644 --- a/src/modules/ims_auth/authorize.c +++ b/src/modules/ims_auth/authorize.c @@ -155,12 +155,6 @@ unsigned char get_auth_scheme_type(str scheme) { return AUTH_UNKNOWN; } -static int get_ha1(struct username* _username, str* _domain, - const str* _table, char* _ha1, db1_res_t** res) { - - return 0; -} - /* * Authorize digest credentials */

1 0

git:master:e6aeda06: carrierroute: undefine code related to mi commands
by Daniel-Constantin Mierla 22 Jun '17

22 Jun '17

Module: kamailio Branch: master Commit: e6aeda065cea8626ef5cd5fb7fee459b5ff43935 URL: https://github.com/kamailio/kamailio/commit/e6aeda065cea8626ef5cd5fb7fee459… Author: Corey Farrell <git(a)cfware.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-22T22:05:36+02:00 carrierroute: undefine code related to mi commands - fixes compiler warnings for unused static symbols --- Modified: src/modules/carrierroute/cr_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/e6aeda065cea8626ef5cd5fb7fee459… Patch: https://github.com/kamailio/kamailio/commit/e6aeda065cea8626ef5cd5fb7fee459… --- diff --git a/src/modules/carrierroute/cr_fifo.c b/src/modules/carrierroute/cr_fifo.c index 8ae012333d..bab8bab41f 100644 --- a/src/modules/carrierroute/cr_fifo.c +++ b/src/modules/carrierroute/cr_fifo.c @@ -59,6 +59,7 @@ static unsigned int opt_settings[5][3] = { int fifo_err; +#ifdef MI_REMOVED static int updated; static int get_fifo_opts(str * buf, fifo_opt_t * opts, unsigned int opt_set[]); @@ -67,7 +68,6 @@ static int update_route_data(fifo_opt_t * opts); static int update_route_data_recursor(struct dtrie_node_t *node, str * act_domain, fifo_opt_t * opts); -#ifdef MI_REMOVED static int dump_tree_recursor (struct mi_node* msg, struct dtrie_node_t *node, char *prefix); static struct mi_root* print_replace_help(void); @@ -75,6 +75,7 @@ static struct mi_root* print_replace_help(void); static struct mi_root* print_fifo_err(void); #endif +#ifdef MI_REMOVED static int str_toklen(str * str, const char * delims) { int len; @@ -94,6 +95,7 @@ static int str_toklen(str * str, const char * delims) return len; } +#endif #ifdef MI_REMOVED /** @@ -737,6 +739,7 @@ static int update_route_data(fifo_opt_t * opts) { #endif +#ifdef MI_REMOVED /** * Does the work for update_route_data by recursively * traversing the routing tree @@ -903,7 +906,6 @@ static int update_route_data_recursor(struct dtrie_node_t *node, str * act_domai return 0; } -#ifdef MI_REMOVED /** * prints a short help text for fifo command usage */

1 0

git:master:5326e1fe: Merge pull request #1162 from SipSeb/master
by GitHub 22 Jun '17

22 Jun '17

Module: kamailio Branch: master Commit: 5326e1fe459983a32e62646c7bd8e6fc2d63f4f4 URL: https://github.com/kamailio/kamailio/commit/5326e1fe459983a32e62646c7bd8e6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-06-22T22:02:42+02:00 Merge pull request #1162 from SipSeb/master app_lua: add "NOTICE" loglevel to sr.log --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/5326e1fe459983a32e62646c7bd8e6f… Patch: https://github.com/kamailio/kamailio/commit/5326e1fe459983a32e62646c7bd8e6f… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index d23ddaca70..f999de3e37 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -96,6 +96,8 @@ static int lua_sr_log (lua_State *L) LM_DBG("%s", txt); } else if(strcasecmp(level, "info")==0) { LM_INFO("%s", txt); + } else if(strcasecmp(level, "notice")==0) { + LM_NOTICE("%s", txt); } else if(strcasecmp(level, "warn")==0) { LM_WARN("%s", txt); } else if(strcasecmp(level, "crit")==0) {

1 0

git:master:c2a27bc0: app_lua: add "NOTICE" loglevel to sr.log
by Sebastian Damm 22 Jun '17

22 Jun '17

Module: kamailio Branch: master Commit: c2a27bc0875aaaec877c75e9b50fbf41011918b1 URL: https://github.com/kamailio/kamailio/commit/c2a27bc0875aaaec877c75e9b50fbf4… Author: Sebastian Damm <damm(a)sipgate.de> Committer: Sebastian Damm <damm(a)sipgate.de> Date: 2017-06-22T16:22:49+02:00 app_lua: add "NOTICE" loglevel to sr.log --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/c2a27bc0875aaaec877c75e9b50fbf4… Patch: https://github.com/kamailio/kamailio/commit/c2a27bc0875aaaec877c75e9b50fbf4… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index d23ddaca70..f999de3e37 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -96,6 +96,8 @@ static int lua_sr_log (lua_State *L) LM_DBG("%s", txt); } else if(strcasecmp(level, "info")==0) { LM_INFO("%s", txt); + } else if(strcasecmp(level, "notice")==0) { + LM_NOTICE("%s", txt); } else if(strcasecmp(level, "warn")==0) { LM_WARN("%s", txt); } else if(strcasecmp(level, "crit")==0) {

1 0

git:master:01afb3bb: pv: $siz - return source ip, with enclosing square brackets for ipv6
by Daniel-Constantin Mierla 22 Jun '17

22 Jun '17

Module: kamailio Branch: master Commit: 01afb3bb1a06c929ffd5bd1f0aaee03df28764a0 URL: https://github.com/kamailio/kamailio/commit/01afb3bb1a06c929ffd5bd1f0aaee03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-22T08:45:36+02:00 pv: $siz - return source ip, with enclosing square brackets for ipv6 --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/01afb3bb1a06c929ffd5bd1f0aaee03… Patch: https://github.com/kamailio/kamailio/commit/01afb3bb1a06c929ffd5bd1f0aaee03… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index e9dc36c4d5..483faa2d19 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -396,6 +396,9 @@ static pv_export_t mod_pvs[] = { {{"si", (sizeof("si")-1)}, /* */ PVT_OTHER, pv_get_srcip, 0, 0, 0, 0, 0}, + {{"siz", (sizeof("siz")-1)}, /* */ + PVT_OTHER, pv_get_srcipz, 0, + 0, 0, 0, 0}, { {"sid", (sizeof("sid")-1)}, /* server id */ PVT_OTHER, pv_get_server_id, 0, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index c39f105852..acd9105cb2 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -665,6 +665,18 @@ int pv_get_srcip(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &s); } +int pv_get_srcipz(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + str s; + if(msg==NULL) + return -1; + + s.s = ip_addr2strz(&msg->rcv.src_ip); + s.len = strlen(s.s); + return pv_get_strval(msg, param, res, &s); +} + int pv_get_srcport(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 3a112a1e31..905fc89db5 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -127,6 +127,9 @@ int pv_get_callid(struct sip_msg *msg, pv_param_t *param, int pv_get_srcip(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_srcipz(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_srcport(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:a526764c: core: updated log macros for parse rpid
by Daniel-Constantin Mierla 21 Jun '17

21 Jun '17

Module: kamailio Branch: master Commit: a526764c65ffea767fecbb13021ba48304524882 URL: https://github.com/kamailio/kamailio/commit/a526764c65ffea767fecbb13021ba48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-21T23:58:37+02:00 core: updated log macros for parse rpid --- Modified: src/core/parser/parse_rpid.c --- Diff: https://github.com/kamailio/kamailio/commit/a526764c65ffea767fecbb13021ba48… Patch: https://github.com/kamailio/kamailio/commit/a526764c65ffea767fecbb13021ba48… --- diff --git a/src/core/parser/parse_rpid.c b/src/core/parser/parse_rpid.c index 6dbb8ae57e..c9290e835f 100644 --- a/src/core/parser/parse_rpid.c +++ b/src/core/parser/parse_rpid.c @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -23,7 +23,7 @@ * * \ingroup parser */ - + #include "parse_from.h" #include "parse_to.h" #include <stdlib.h> @@ -33,7 +33,7 @@ #include "../ut.h" #include "../mem/mem.h" - + /*! \brief * This method is used to parse RPID header. * @@ -44,34 +44,34 @@ int parse_rpid_header( struct sip_msg *msg ) { struct to_body* rpid_b; - - if ( !msg->rpid && (parse_headers(msg, HDR_RPID_F, 0)==-1 || !msg->rpid)) { - goto error; - } - - /* maybe the header is already parsed! */ - if (msg->rpid->parsed) - return 0; - - /* bad luck! :-( - we have to parse it */ - /* first, get some memory */ - rpid_b = pkg_malloc(sizeof(struct to_body)); - if (rpid_b == 0) { - LOG(L_ERR, "ERROR:parse_rpid_header: out of pkg_memory\n"); - goto error; - } - - /* now parse it!! */ - memset(rpid_b, 0, sizeof(struct to_body)); - parse_to(msg->rpid->body.s,msg->rpid->body.s+msg->rpid->body.len+1,rpid_b); - if (rpid_b->error == PARSE_ERROR) { - LOG(L_ERR, "ERROR:parse_rpid_header: bad rpid header\n"); - free_to(rpid_b); - goto error; - } - msg->rpid->parsed = rpid_b; - - return 0; - error: - return -1; + + if ( !msg->rpid && (parse_headers(msg, HDR_RPID_F, 0)==-1 || !msg->rpid)) { + goto error; + } + + /* maybe the header is already parsed! */ + if (msg->rpid->parsed) + return 0; + + /* needs to parse it */ + /* first, get some memory */ + rpid_b = pkg_malloc(sizeof(struct to_body)); + if (rpid_b == 0) { + LM_ERR("out of pkg_memory\n"); + goto error; + } + + /* now parse it!! */ + memset(rpid_b, 0, sizeof(struct to_body)); + parse_to(msg->rpid->body.s,msg->rpid->body.s+msg->rpid->body.len+1,rpid_b); + if (rpid_b->error == PARSE_ERROR) { + LM_ERR("bad rpid header\n"); + free_to(rpid_b); + goto error; + } + msg->rpid->parsed = rpid_b; + + return 0; +error: + return -1; }

1 0

git:master:155160c7: modules: readme files regenerated - pike ... [skip ci]
by Kamailio Dev 21 Jun '17

21 Jun '17

Module: kamailio Branch: master Commit: 155160c73a95cd7647f246a4a19ea0962afdc5c3 URL: https://github.com/kamailio/kamailio/commit/155160c73a95cd7647f246a4a19ea09… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-21T20:46:26+02:00 modules: readme files regenerated - pike ... [skip ci] --- Modified: src/modules/pike/README Modified: src/modules/seas/README Modified: src/modules/sl/README --- Diff: https://github.com/kamailio/kamailio/commit/155160c73a95cd7647f246a4a19ea09… Patch: https://github.com/kamailio/kamailio/commit/155160c73a95cd7647f246a4a19ea09… --- diff --git a/src/modules/pike/README b/src/modules/pike/README index 92cd2a330a..58dc8ba39f 100644 --- a/src/modules/pike/README +++ b/src/modules/pike/README @@ -143,7 +143,7 @@ modparam("pike", "reqs_density_per_unit", 30) 3.3. remove_latency (integer) - Speciies for how long the IP address will be kept in memory after the + Specifies for how long the IP address will be kept in memory after the last request from that IP address. It's a sort of timeout value, in seconds. Note that it is not the duration to keep the IP in state 'blocked'. An IP is unblocked next occurence of 'sampling_time_unit' diff --git a/src/modules/seas/README b/src/modules/seas/README index abffbd8bc8..0ffda049cb 100644 --- a/src/modules/seas/README +++ b/src/modules/seas/README @@ -188,7 +188,7 @@ Chapter 1. The Sip Express Application Server User's Guide Application Server. The Application Server then executes some call-control logic code, and tells Kamailio to take some actions, ie. forward the message downstream, or respond to the message with a SIP - repy, etc. + reply, etc. The module acts implements a network protocol acting as the interface between Kamailio internal API and the external Application Server diff --git a/src/modules/sl/README b/src/modules/sl/README index 64b10ebfcf..24f7ec8b0d 100644 --- a/src/modules/sl/README +++ b/src/modules/sl/README @@ -246,7 +246,7 @@ sl_reply_error(); 3.4. sl_forward _reply([ code, [ reason ] ]) - Forward statelessy the current received SIP reply, with the option to + Forward statelessly the current received SIP reply, with the option to change the status code and reason text. The new code has to be in the same class. The received reply is forwarded as well by core when the config execution ended, unless it is dropped from config.

1 0

git:master:59538b66: core: parser - fix comment typo [skip ci]
by Mikko Lehto 21 Jun '17

21 Jun '17

Module: kamailio Branch: master Commit: 59538b66e8b8f17512b3f73c160e5de734a85a8e URL: https://github.com/kamailio/kamailio/commit/59538b66e8b8f17512b3f73c160e5de… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-21T21:40:03+03:00 core: parser - fix comment typo [skip ci] --- Modified: src/core/parser/parse_param.c Modified: src/core/parser/parse_param.h --- Diff: https://github.com/kamailio/kamailio/commit/59538b66e8b8f17512b3f73c160e5de… Patch: https://github.com/kamailio/kamailio/commit/59538b66e8b8f17512b3f73c160e5de… --- diff --git a/src/core/parser/parse_param.c b/src/core/parser/parse_param.c index 31b14c8835..336bf88a8a 100644 --- a/src/core/parser/parse_param.c +++ b/src/core/parser/parse_param.c @@ -460,7 +460,7 @@ static inline int parse_param_body(str *_s, param_t *_c, char separator) * t: out parameter * -1: on error * 0: success, but expect a next paramter - * 1: success and exepect no more parameters + * 1: success and expect no more parameters */ static inline int parse_param2( str *_s, pclass_t _c, param_hooks_t *_h, param_t *t, char separator) @@ -533,7 +533,7 @@ static inline int parse_param2( * t: out parameter * -1: on error * 0: success, but expect a next paramter - * 1: success and exepect no more parameters + * 1: success and expect no more parameters */ int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t) { diff --git a/src/core/parser/parse_param.h b/src/core/parser/parse_param.h index 5622df998e..1007358125 100644 --- a/src/core/parser/parse_param.h +++ b/src/core/parser/parse_param.h @@ -141,7 +141,7 @@ typedef union param_hooks { * t: out parameter * -1: on error * 0: success, but expect a next paramter - * 1: success and exepect no more parameters + * 1: success and expect no more parameters */ extern int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t);

1 0

git:master:877f768d: modules/dispatcher: comment typo [skip ci]
by Mikko Lehto 21 Jun '17

21 Jun '17

Module: kamailio Branch: master Commit: 877f768de281f9422a68bc82d1e9f87462eb398d URL: https://github.com/kamailio/kamailio/commit/877f768de281f9422a68bc82d1e9f87… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-21T21:40:03+03:00 modules/dispatcher: comment typo [skip ci] --- Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/877f768de281f9422a68bc82d1e9f87… Patch: https://github.com/kamailio/kamailio/commit/877f768de281f9422a68bc82d1e9f87… --- diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 5ab51d7945..6ab8d5661e 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -175,7 +175,7 @@ typedef struct _ds_set { int nr; /*!< number of items in dst set */ int last; /*!< last used item in dst set (round robin) */ int wlast; /*!< last used item in dst set (by weight) */ - int rwlast; /*!< last used item in dst set (by relaitive weight) */ + int rwlast; /*!< last used item in dst set (by relative weight) */ ds_dest_t *dlist; unsigned int wlist[100]; unsigned int rwlist[100];

1 0

git:master:1c8aa5b7: modules/pike: fix documentation typo [skip ci]
by Mikko Lehto 21 Jun '17

21 Jun '17

Module: kamailio Branch: master Commit: 1c8aa5b7d6569bd758d3f74c84310c4634f1ce7b URL: https://github.com/kamailio/kamailio/commit/1c8aa5b7d6569bd758d3f74c84310c4… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-21T21:40:03+03:00 modules/pike: fix documentation typo [skip ci] --- Modified: src/modules/pike/doc/pike_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1c8aa5b7d6569bd758d3f74c84310c4… Patch: https://github.com/kamailio/kamailio/commit/1c8aa5b7d6569bd758d3f74c84310c4… --- diff --git a/src/modules/pike/doc/pike_admin.xml b/src/modules/pike/doc/pike_admin.xml index fdc329b040..fe6891e330 100644 --- a/src/modules/pike/doc/pike_admin.xml +++ b/src/modules/pike/doc/pike_admin.xml @@ -110,7 +110,7 @@ modparam("pike", "reqs_density_per_unit", 30) <section id="pike.p.remove_latency"> <title><varname>remove_latency</varname> (integer)</title> <para> - Speciies for how long the IP address will be kept in memory after the last + Specifies for how long the IP address will be kept in memory after the last request from that IP address. It's a sort of timeout value, in seconds. Note that it is not the duration to keep the IP in state 'blocked'. An IP is unblocked next occurence of 'sampling_time_unit' that does not

1 0

git:master:f3e1a9b9: modules: fix common typo [skip ci]
by Mikko Lehto 21 Jun '17

21 Jun '17

Module: kamailio Branch: master Commit: f3e1a9b90952040a4275b81a57e4f78f8f235e5e URL: https://github.com/kamailio/kamailio/commit/f3e1a9b90952040a4275b81a57e4f78… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-21T21:40:02+03:00 modules: fix common typo [skip ci] --- Modified: src/modules/ims_auth/cxdx_avp.c Modified: src/modules/ims_auth/cxdx_avp.h Modified: src/modules/ims_icscf/scscf_list.c Modified: src/modules/ims_icscf/scscf_list.h Modified: src/modules/ims_registrar_scscf/cxdx_avp.c Modified: src/modules/ims_registrar_scscf/cxdx_avp.h Modified: src/modules/seas/doc/seas_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f3e1a9b90952040a4275b81a57e4f78… Patch: https://github.com/kamailio/kamailio/commit/f3e1a9b90952040a4275b81a57e4f78…

1 0

git:master:16bfd2de: examples, modules: fix common typo [skip ci]
by Mikko Lehto 21 Jun '17

21 Jun '17

Module: kamailio Branch: master Commit: 16bfd2deedb5a66186b77e317453561c339b3c72 URL: https://github.com/kamailio/kamailio/commit/16bfd2deedb5a66186b77e317453561… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-06-21T21:39:58+03:00 examples, modules: fix common typo [skip ci] --- Modified: etc/kamailio-basic.cfg Modified: etc/kamailio-oob.cfg Modified: etc/kamailio.cfg Modified: misc/examples/kemi/kamailio-basic-kemi-jsdt.js Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua Modified: misc/examples/kemi/kamailio-basic-kemi-native.cfg Modified: misc/examples/kemi/kamailio-basic-kemi-python.py Modified: misc/examples/kemi/kamailio-basic-kemi-sqlang.sq Modified: src/modules/app_java/kamailio_java_folder/java-untested/Kamailio.java Modified: src/modules/cnxcc/example/kamailio-cnxcc.cfg Modified: src/modules/sl/doc/sl_functions.xml Modified: src/modules/sl/sl.c --- Diff: https://github.com/kamailio/kamailio/commit/16bfd2deedb5a66186b77e317453561… Patch: https://github.com/kamailio/kamailio/commit/16bfd2deedb5a66186b77e317453561…

1 0

[kamailio/kamailio] pv: add received ip/port pvars for advertised ip/port (#1158)
by lazedo 20 Jun '17

20 Jun '17

adds $RAi , $RAp if advertise is not set, defaults to reveived ip/port You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1158 -- Commit Summary -- * pv: add received ip/port pvars for advertised ip/port -- File Changes -- M src/modules/pv/pv.c (8) M src/modules/pv/pv_core.c (28) M src/modules/pv/pv_core.h (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1158.patch https://github.com/kamailio/kamailio/pull/1158.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1158

2 2

git:master:20a96162: Merge pull request #1158 from kamailio/pv-received-adv-address
by GitHub 20 Jun '17

20 Jun '17

Module: kamailio Branch: master Commit: 20a961624bbe164d9120b7c9ac60df8ff1daaae4 URL: https://github.com/kamailio/kamailio/commit/20a961624bbe164d9120b7c9ac60df8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-06-20T18:54:12+02:00 Merge pull request #1158 from kamailio/pv-received-adv-address pv: add received ip/port pvars for advertised ip/port --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/20a961624bbe164d9120b7c9ac60df8… Patch: https://github.com/kamailio/kamailio/commit/20a961624bbe164d9120b7c9ac60df8… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index d619517c07..e9dc36c4d5 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -375,6 +375,12 @@ static pv_export_t mod_pvs[] = { {{"Rp", (sizeof("Rp")-1)}, /* */ PVT_OTHER, pv_get_rcvport, 0, 0, 0, 0, 0}, + {{"RAi", (sizeof("RAi")-1)}, /* */ + PVT_OTHER, pv_get_rcv_advertised_ip, 0, + 0, 0, 0, 0}, + {{"RAp", (sizeof("RAp")-1)}, /* */ + PVT_OTHER, pv_get_rcv_advertised_port, 0, + 0, 0, 0, 0}, {{"sf", (sizeof("sf")-1)}, /* */ PVT_OTHER, pv_get_sflags, pv_set_sflags, 0, 0, 0, 0}, @@ -950,4 +956,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) return -1; } return register_trans_mod(path, mod_trans); -} \ No newline at end of file +} diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index cf0b60670f..c39f105852 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -739,6 +739,34 @@ int pv_get_rcvport(struct sip_msg *msg, pv_param_t *param, &msg->rcv.bind_address->port_no_str); } +int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address!=NULL + && msg->rcv.bind_address->useinfo.address_str.len > 0) { + return pv_get_strval(msg, param, res, &msg->rcv.bind_address->useinfo.address_str); + } + + return pv_get_rcvip(msg, param, res); +} + +int pv_get_rcv_advertised_port(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address!=NULL + && msg->rcv.bind_address->useinfo.port_no_str.len > 0) { + return pv_get_strval(msg, param, res, &msg->rcv.bind_address->useinfo.port_no_str); + } + + return pv_get_rcvport(msg, param, res); +} + /** * */ diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 98e6b56554..3a112a1e31 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -142,6 +142,12 @@ int pv_get_rcvip(struct sip_msg *msg, pv_param_t *param, int pv_get_rcvport(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + +int pv_get_rcv_advertised_port(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_force_sock(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:5a825ddf: pv: add received ip/port pvars for advertised ip/port
by lazedo 20 Jun '17

20 Jun '17

Module: kamailio Branch: master Commit: 5a825ddf6bd97f7a309ba7b663496c04a6895899 URL: https://github.com/kamailio/kamailio/commit/5a825ddf6bd97f7a309ba7b663496c0… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-06-20T15:24:09+01:00 pv: add received ip/port pvars for advertised ip/port adds $RAi , $RAp if advertise is not set, defaults to reveived ip/port --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/5a825ddf6bd97f7a309ba7b663496c0… Patch: https://github.com/kamailio/kamailio/commit/5a825ddf6bd97f7a309ba7b663496c0… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index d619517c07..e9dc36c4d5 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -375,6 +375,12 @@ static pv_export_t mod_pvs[] = { {{"Rp", (sizeof("Rp")-1)}, /* */ PVT_OTHER, pv_get_rcvport, 0, 0, 0, 0, 0}, + {{"RAi", (sizeof("RAi")-1)}, /* */ + PVT_OTHER, pv_get_rcv_advertised_ip, 0, + 0, 0, 0, 0}, + {{"RAp", (sizeof("RAp")-1)}, /* */ + PVT_OTHER, pv_get_rcv_advertised_port, 0, + 0, 0, 0, 0}, {{"sf", (sizeof("sf")-1)}, /* */ PVT_OTHER, pv_get_sflags, pv_set_sflags, 0, 0, 0, 0}, @@ -950,4 +956,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) return -1; } return register_trans_mod(path, mod_trans); -} \ No newline at end of file +} diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index cf0b60670f..c39f105852 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -739,6 +739,34 @@ int pv_get_rcvport(struct sip_msg *msg, pv_param_t *param, &msg->rcv.bind_address->port_no_str); } +int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address!=NULL + && msg->rcv.bind_address->useinfo.address_str.len > 0) { + return pv_get_strval(msg, param, res, &msg->rcv.bind_address->useinfo.address_str); + } + + return pv_get_rcvip(msg, param, res); +} + +int pv_get_rcv_advertised_port(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address!=NULL + && msg->rcv.bind_address->useinfo.port_no_str.len > 0) { + return pv_get_strval(msg, param, res, &msg->rcv.bind_address->useinfo.port_no_str); + } + + return pv_get_rcvport(msg, param, res); +} + /** * */ diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 98e6b56554..3a112a1e31 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -142,6 +142,12 @@ int pv_get_rcvip(struct sip_msg *msg, pv_param_t *param, int pv_get_rcvport(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + +int pv_get_rcv_advertised_port(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_force_sock(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:10129d05: core: faked msg - functions to get next fmsg with clear branches
by Daniel-Constantin Mierla 20 Jun '17

20 Jun '17

Module: kamailio Branch: master Commit: 10129d056e3660a33b6ebc7b487b1de0f616dcc9 URL: https://github.com/kamailio/kamailio/commit/10129d056e3660a33b6ebc7b487b1de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-20T16:00:00+02:00 core: faked msg - functions to get next fmsg with clear branches --- Modified: src/core/fmsg.c Modified: src/core/fmsg.h --- Diff: https://github.com/kamailio/kamailio/commit/10129d056e3660a33b6ebc7b487b1de… Patch: https://github.com/kamailio/kamailio/commit/10129d056e3660a33b6ebc7b487b1de… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index ba83a5b876..888032517a 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -69,16 +69,33 @@ int faked_msg_init(void) return 0; } -sip_msg_t* faked_msg_next(void) +static inline sip_msg_t* faked_msg_next_id(int mode) { _faked_msg.id = 1 + _faked_msg_no++; _faked_msg.pid = my_pid(); memset(&_faked_msg.tval, 0, sizeof(struct timeval)); + if(mode) clear_branches(); return &_faked_msg; } +sip_msg_t* faked_msg_next(void) +{ + return faked_msg_next_id(0); +} + +sip_msg_t* faked_msg_next_clear(void) +{ + return faked_msg_next_id(1); +} + sip_msg_t* faked_msg_get_next(void) { faked_msg_init(); return faked_msg_next(); } + +sip_msg_t* faked_msg_get_next_clear(void) +{ + faked_msg_init(); + return faked_msg_next_clear(); +} diff --git a/src/core/fmsg.h b/src/core/fmsg.h index ada40c15a0..b279100269 100644 --- a/src/core/fmsg.h +++ b/src/core/fmsg.h @@ -27,5 +27,7 @@ int faked_msg_init(void); sip_msg_t* faked_msg_next(void); sip_msg_t* faked_msg_get_next(void); +sip_msg_t* faked_msg_next_clear(void); +sip_msg_t* faked_msg_get_next_clear(void); #endif

1 0

git:master:81dd019c: Merge pull request #1157 from eloycoto/evapi
by GitHub 20 Jun '17

20 Jun '17

Module: kamailio Branch: master Commit: 81dd019c6afc0681fe23e281c139a5c63188e02f URL: https://github.com/kamailio/kamailio/commit/81dd019c6afc0681fe23e281c139a5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-06-20T15:42:34+02:00 Merge pull request #1157 from eloycoto/evapi evapi: Improved error message --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/81dd019c6afc0681fe23e281c139a5c… Patch: https://github.com/kamailio/kamailio/commit/81dd019c6afc0681fe23e281c139a5c… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 1639c5d4d8..5429d6913b 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -492,7 +492,7 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent csock = accept(watcher->fd, (struct sockaddr *)&caddr, &clen); if (csock < 0) { - LM_ERR("cannot accept the client\n"); + LM_ERR("cannot accept the client '%s' err='%d'\n", gai_strerror(csock), csock); free(evapi_client); return; }

1 0

git:master:5f249318: evapi: Improved error message
by Eloy Coto 20 Jun '17

20 Jun '17

Module: kamailio Branch: master Commit: 5f249318adfe26b35426c2b43f4c3df31edc1de1 URL: https://github.com/kamailio/kamailio/commit/5f249318adfe26b35426c2b43f4c3df… Author: Eloy Coto <eloy.coto(a)gmail.com> Committer: Eloy Coto <eloy.coto(a)gmail.com> Date: 2017-06-20T14:06:48+01:00 evapi: Improved error message Signed-off-by: Eloy Coto <eloy.coto(a)gmail.com> --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/5f249318adfe26b35426c2b43f4c3df… Patch: https://github.com/kamailio/kamailio/commit/5f249318adfe26b35426c2b43f4c3df… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 1639c5d4d8..5429d6913b 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -492,7 +492,7 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent csock = accept(watcher->fd, (struct sockaddr *)&caddr, &clen); if (csock < 0) { - LM_ERR("cannot accept the client\n"); + LM_ERR("cannot accept the client '%s' err='%d'\n", gai_strerror(csock), csock); free(evapi_client); return; }

1 0

[kamailio/kamailio] evapi: Improved error message (#1157)
by Eloy Coto 20 Jun '17

20 Jun '17

Hello, We're getting this error message, and I'm not sure why. So I added the error cause in the log. Regards. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1157 -- Commit Summary -- * evapi: Improved error message -- File Changes -- M src/modules/evapi/evapi_dispatch.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1157.patch https://github.com/kamailio/kamailio/pull/1157.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1157

2 1

git:master:84055140: Merge pull request #1156 from adubovikov/master
by GitHub 20 Jun '17

20 Jun '17

Module: kamailio Branch: master Commit: 84055140f04ca6e8296bdd4d03e02625e71a6ea1 URL: https://github.com/kamailio/kamailio/commit/84055140f04ca6e8296bdd4d03e0262… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-06-20T15:41:50+02:00 Merge pull request #1156 from adubovikov/master modules/topoh: fixed log's level. --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/84055140f04ca6e8296bdd4d03e0262… Patch: https://github.com/kamailio/kamailio/commit/84055140f04ca6e8296bdd4d03e0262… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 23679a2b5d..91a1b7f29c 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -557,7 +557,7 @@ int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp) } set_route_type(rtb); if(ctx.run_flags&DROP_R_F) { - LM_ERR("exit due to 'drop' in event route\n"); + LM_DBG("exit due to 'drop' in event route\n"); p_onsend=NULL; return 1; }

1 0

git:master:1d073ec5: modules/topoh: fixed log's level.
by Alexandr Dubovikov 20 Jun '17

20 Jun '17

Module: kamailio Branch: master Commit: 1d073ec529053c6bc649398578068f749e11d253 URL: https://github.com/kamailio/kamailio/commit/1d073ec529053c6bc649398578068f7… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2017-06-20T13:15:38+02:00 modules/topoh: fixed log's level. --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1d073ec529053c6bc649398578068f7… Patch: https://github.com/kamailio/kamailio/commit/1d073ec529053c6bc649398578068f7… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 23679a2b5d..91a1b7f29c 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -557,7 +557,7 @@ int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp) } set_route_type(rtb); if(ctx.run_flags&DROP_R_F) { - LM_ERR("exit due to 'drop' in event route\n"); + LM_DBG("exit due to 'drop' in event route\n"); p_onsend=NULL; return 1; }

1 0

[kamailio/kamailio] modules/topoh: fixed log's level. (#1156)
by Alexandr Dubovikov 20 Jun '17

20 Jun '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1156 -- Commit Summary -- * modules/topoh: fixed log's level. -- File Changes -- M src/modules/topoh/topoh_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1156.patch https://github.com/kamailio/kamailio/pull/1156.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1156

2 1

[kamailio/kamailio] modules/topoh: added lookup functionality for destination IP (#1150)
by Alexandr Dubovikov 20 Jun '17

20 Jun '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1150 -- Commit Summary -- * modules/topoh: added IP lookup functionality for trusted or untrusted destination * modules/topoh: changed README * utils/kamctl: fixed sql schema for topoh modules -- File Changes -- M src/core/forward.h (5) M src/modules/cfgt/cfgt_int.c (6) M src/modules/corex/corex_nio.c (6) M src/modules/dialog/dlg_cseq.c (6) M src/modules/gzcompress/gzcompress_mod.c (6) M src/modules/topoh/Makefile (2) M src/modules/topoh/README (169) A src/modules/topoh/address.c (395) A src/modules/topoh/address.h (71) M src/modules/topoh/doc/topoh.xml (12) M src/modules/topoh/doc/topoh_admin.xml (197) A src/modules/topoh/hash.c (454) A src/modules/topoh/hash.h (165) M src/modules/topoh/th_msg.c (1) M src/modules/topoh/topoh_mod.c (69) A src/modules/topoh/topoh_mod.h (42) M src/modules/topos/topos_mod.c (9) A utils/kamctl/db_sqlite/topoh-create.sql (11) A utils/kamctl/dbtext/kamailio/topoh_address (2) M utils/kamctl/dbtext/kamailio/version (1) M utils/kamctl/kamctlrc (2) A utils/kamctl/mysql/topoh-create.sql (11) A utils/kamctl/oracle/topoh-create.sql (19) A utils/kamctl/postgres/topoh-create.sql (11) A utils/kamctl/xhttp_pi/topoh-table (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1150.patch https://github.com/kamailio/kamailio/pull/1150.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1150

3 18

git:master:f51b2784: Merge pull request #1155 from adubovikov/master
by GitHub 20 Jun '17

20 Jun '17

Module: kamailio Branch: master Commit: f51b27840b434fd6c65c6ed15b67c949d644faa9 URL: https://github.com/kamailio/kamailio/commit/f51b27840b434fd6c65c6ed15b67c94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-06-20T10:02:56+02:00 Merge pull request #1155 from adubovikov/master modules/topoh: fixed logical conditional and false jump in th_executeâ¦ --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f51b27840b434fd6c65c6ed15b67c94… Patch: https://github.com/kamailio/kamailio/commit/f51b27840b434fd6c65c6ed15b67c94… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index a749723cd8..23679a2b5d 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -408,7 +408,7 @@ int th_msg_sent(sr_event_param_t *evp) obuf = (str*)evp->data; if(th_execute_event_route(NULL, evp)==1) { - goto done; + return 0; } memset(&msg, 0, sizeof(sip_msg_t)); @@ -519,7 +519,7 @@ int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp) } } - if(_th_eventrt_outgoing<0 || keng==NULL) { + if(_th_eventrt_outgoing<0 && keng==NULL) { return 0; }

1 0

git:master:b4619fe7: modules/topoh: fixed logical conditional and false jump in th_execute_event_route
by Alexandr Dubovikov 20 Jun '17

20 Jun '17

Module: kamailio Branch: master Commit: b4619fe75ab7a8d87ea4b50450d6800e068bc62c URL: https://github.com/kamailio/kamailio/commit/b4619fe75ab7a8d87ea4b50450d6800… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2017-06-20T09:50:38+02:00 modules/topoh: fixed logical conditional and false jump in th_execute_event_route --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b4619fe75ab7a8d87ea4b50450d6800… Patch: https://github.com/kamailio/kamailio/commit/b4619fe75ab7a8d87ea4b50450d6800… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index a749723cd8..23679a2b5d 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -408,7 +408,7 @@ int th_msg_sent(sr_event_param_t *evp) obuf = (str*)evp->data; if(th_execute_event_route(NULL, evp)==1) { - goto done; + return 0; } memset(&msg, 0, sizeof(sip_msg_t)); @@ -519,7 +519,7 @@ int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp) } } - if(_th_eventrt_outgoing<0 || keng==NULL) { + if(_th_eventrt_outgoing<0 && keng==NULL) { return 0; }

1 0

[kamailio/kamailio] modules/topoh: fixed logical conditional and false jump in th_execute… (#1155)
by Alexandr Dubovikov 20 Jun '17

20 Jun '17

…_event_route You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1155 -- Commit Summary -- * modules/topoh: fixed logical conditional and false jump in th_execute_event_route -- File Changes -- M src/modules/topoh/topoh_mod.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1155.patch https://github.com/kamailio/kamailio/pull/1155.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1155

2 2

git:master:f58958e9: modules: readme files regenerated - db_sqlite ... [skip ci]
by Kamailio Dev 20 Jun '17

20 Jun '17

Module: kamailio Branch: master Commit: f58958e92dbc263b72a77395e828a38c123766e6 URL: https://github.com/kamailio/kamailio/commit/f58958e92dbc263b72a77395e828a38… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-20T08:46:49+02:00 modules: readme files regenerated - db_sqlite ... [skip ci] --- Modified: src/modules/db_sqlite/README --- Diff: https://github.com/kamailio/kamailio/commit/f58958e92dbc263b72a77395e828a38… Patch: https://github.com/kamailio/kamailio/commit/f58958e92dbc263b72a77395e828a38… --- diff --git a/src/modules/db_sqlite/README b/src/modules/db_sqlite/README index 41ba51772e..a6c3b0b206 100644 --- a/src/modules/db_sqlite/README +++ b/src/modules/db_sqlite/README @@ -31,6 +31,7 @@ Julien Chavanton 3. Parameters 3.1. db_set_readonly (string) + 3.2. db_set_journal_mode (string) 4. Functions 5. Usage @@ -38,9 +39,10 @@ Julien Chavanton List of Examples 1.1. Set db_set_readonly parameter - 1.2. loading the module usage - 1.3. db_url module parameter usage - 1.4. DBURL define usage + 1.2. Set db_set_journal_mode parameter + 1.3. loading the module usage + 1.4. db_url module parameter usage + 1.5. DBURL define usage Chapter 1. Admin Guide @@ -55,6 +57,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. db_set_readonly (string) + 3.2. db_set_journal_mode (string) 4. Functions 5. Usage @@ -85,6 +88,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. db_set_readonly (string) + 3.2. db_set_journal_mode (string) 3.1. db_set_readonly (string) @@ -94,7 +98,7 @@ Chapter 1. Admin Guide parameter may be set multiple times to set many DB connections to readonly in the same configuration file. - By default all the db connection are using "SQLITE_OPEN_READWRITE | + By default all the db connections are using "SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE" Example 1.1. Set db_set_readonly parameter @@ -104,6 +108,29 @@ modparam("sqlops","sqlcon","lrn=>sqlite:////var/mydb.sqlite") # Example if using the sqlops module ... +3.2. db_set_journal_mode (string) + + This will set the db connection journal mode, for the given connection. + The value is the full path to the sqlite file used for example in any + db_url or sqlops/sqlcon Other journal mode are : DELETE | TRUNCATE | + PERSIST | MEMORY | WAL | OFF This parameter may be set multiple times + to set many DB connections to readonly in the same configuration file. + + By default all the db connections are using sqlite default journaling + mode. + + Example 1.2. Set db_set_journal_mode parameter +... +# In this example we are using Write-Ahead Logging in order to update the databa +se from another process(external to Kamailio) without facing any locking. + +#!subst "!DB_FILE!/var/mydb.sqlite!" +modparam("db_sqlite","db_set_readonly","DB_FILE") # We are also opening the da +tabase in readonly +modparam("db_sqlite","db_set_journal_mode","DB_FILE=WAL;") +modparam("sqlops","sqlcon","lrn=>sqlite:///DB_FILE") +... + 4. Functions NONE @@ -113,7 +140,7 @@ modparam("sqlops","sqlcon","lrn=>sqlite:////var/mydb.sqlite") # Example if using To use the module, first you have to load it in the Kamailio configuration file. - Example 1.2. loading the module usage + Example 1.3. loading the module usage ... loadmodule "db_sqlite.so" ... @@ -122,14 +149,14 @@ loadmodule "db_sqlite.so" the SQLite database to driver part 'sqlite://', followed by the path to database file. For example: - Example 1.3. db_url module parameter usage + Example 1.4. db_url module parameter usage ... modparam("auth_db", "db_url", "sqlite:///etc/kamailio/kamailio.db") ... In the default config file, defined token DBURL can be updated like: - Example 1.4. DBURL define usage + Example 1.5. DBURL define usage ... #!define DBURL "sqlite:///etc/kamailio/kamailio.db" ...

1 0

git:master:8885a039: Merge pull request #1153 from jchavanton/db_sqlite_journaling
by GitHub 20 Jun '17

20 Jun '17

Module: kamailio Branch: master Commit: 8885a0392cf22b2217cbe2b05d8a412d38ba31b7 URL: https://github.com/kamailio/kamailio/commit/8885a0392cf22b2217cbe2b05d8a412… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-06-20T08:34:30+02:00 Merge pull request #1153 from jchavanton/db_sqlite_journaling db_sqlite: new param to set database journal mode --- Modified: src/modules/db_sqlite/db_sqlite.c Modified: src/modules/db_sqlite/db_sqlite.h Modified: src/modules/db_sqlite/dbase.c Modified: src/modules/db_sqlite/doc/db_sqlite_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8885a0392cf22b2217cbe2b05d8a412… Patch: https://github.com/kamailio/kamailio/commit/8885a0392cf22b2217cbe2b05d8a412…

1 0

git:master:b35a11f2: db_sqlite: new param to set database journal mode
by Julien Chavanton 20 Jun '17

20 Jun '17

Module: kamailio Branch: master Commit: b35a11f24b9e66f967551345b92f3b050b2786bc URL: https://github.com/kamailio/kamailio/commit/b35a11f24b9e66f967551345b92f3b0… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2017-06-19T14:35:49-07:00 db_sqlite: new param to set database journal mode --- Modified: src/modules/db_sqlite/db_sqlite.c Modified: src/modules/db_sqlite/db_sqlite.h Modified: src/modules/db_sqlite/dbase.c Modified: src/modules/db_sqlite/doc/db_sqlite_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b35a11f24b9e66f967551345b92f3b0… Patch: https://github.com/kamailio/kamailio/commit/b35a11f24b9e66f967551345b92f3b0…

1 0

[kamailio/kamailio] db_sqlite: new param to set database journal mode (#1153)
by Julien Chavanton 20 Jun '17

20 Jun '17

Exposing journal mode as a module parameter, one great feature is to be able to use WAL mode and share a database in read / write mode with facing any locking. https://sqlite.org/wal.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1153 -- Commit Summary -- * db_sqlite: new param to set database journal mode -- File Changes -- M src/modules/db_sqlite/db_sqlite.c (86) M src/modules/db_sqlite/db_sqlite.h (3) M src/modules/db_sqlite/dbase.c (30) M src/modules/db_sqlite/doc/db_sqlite_admin.xml (31) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1153.patch https://github.com/kamailio/kamailio/pull/1153.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1153

2 2

git:master:68db22bd: core: do not execute clear_branches() on next faked msg
by Daniel-Constantin Mierla 19 Jun '17

19 Jun '17

Module: kamailio Branch: master Commit: 68db22bdfe50ff34df8e33bc06b80b5ad4844d7b URL: https://github.com/kamailio/kamailio/commit/68db22bdfe50ff34df8e33bc06b80b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-19T16:26:00+02:00 core: do not execute clear_branches() on next faked msg - the function clears the global variables for branches --- Modified: src/core/fmsg.c --- Diff: https://github.com/kamailio/kamailio/commit/68db22bdfe50ff34df8e33bc06b80b5… Patch: https://github.com/kamailio/kamailio/commit/68db22bdfe50ff34df8e33bc06b80b5… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index 9b30ea295c..ba83a5b876 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -74,7 +74,6 @@ sip_msg_t* faked_msg_next(void) _faked_msg.id = 1 + _faked_msg_no++; _faked_msg.pid = my_pid(); memset(&_faked_msg.tval, 0, sizeof(struct timeval)); - clear_branches(); return &_faked_msg; }

1 0

git:master:f8697609: cfgutils: core_hash() exported to kemi framework
by Daniel-Constantin Mierla 18 Jun '17

18 Jun '17

Module: kamailio Branch: master Commit: f86976098695f2b7fb765d8c59da6da96d791235 URL: https://github.com/kamailio/kamailio/commit/f86976098695f2b7fb765d8c59da6da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-18T08:32:04+02:00 cfgutils: core_hash() exported to kemi framework --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/f86976098695f2b7fb765d8c59da6da… Patch: https://github.com/kamailio/kamailio/commit/f86976098695f2b7fb765d8c59da6da… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index 571ff3b71d..0b72186546 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -943,6 +943,18 @@ static int w_core_hash(struct sip_msg *msg, char *p1, char *p2, char *p3) return core_hash(&s1, s2.len ? &s2 : NULL, size) + 1; } +static int ki_core_hash(sip_msg_t *msg, str *s1, str *s2, int sz) +{ + int size; + + size = sz; + + if (size <= 0) size = 2; + else size = 1 << size; + + return core_hash(s1, (s2 && s2->len>0)?s2:NULL, size) + 1; +} + /** * @brief bind functions to CFGUTILS API structure */ @@ -1023,6 +1035,11 @@ static sr_kemi_t sr_kemi_cfgutils_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("cfgutils"), str_init("core_hash"), + SR_KEMIP_INT, ki_core_hash, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:a75ab7d2: cfgutils: exported abort and mem functions to kemi framework
by Daniel-Constantin Mierla 17 Jun '17

17 Jun '17

Module: kamailio Branch: master Commit: a75ab7d254dd3a2d0b5ab6e2872068cb6bb26082 URL: https://github.com/kamailio/kamailio/commit/a75ab7d254dd3a2d0b5ab6e2872068c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-17T22:32:00+02:00 cfgutils: exported abort and mem functions to kemi framework --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/a75ab7d254dd3a2d0b5ab6e2872068c… Patch: https://github.com/kamailio/kamailio/commit/a75ab7d254dd3a2d0b5ab6e2872068c… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index e4560f7226..571ff3b71d 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -647,30 +647,61 @@ static int dbg_abort(struct sip_msg* msg, char* foo, char* bar) return 0; } +static int ki_abort(sip_msg_t* msg) +{ + LM_CRIT("abort called\n"); + abort(); + return 0; +} + static int dbg_pkg_status(struct sip_msg* msg, char* foo, char* bar) { pkg_status(); return 1; } +static int ki_pkg_status(sip_msg_t* msg) +{ + pkg_status(); + return 1; +} + static int dbg_shm_status(struct sip_msg* msg, char* foo, char* bar) { shm_status(); return 1; } +static int ki_shm_status(sip_msg_t* msg) +{ + shm_status(); + return 1; +} + static int dbg_pkg_summary(struct sip_msg* msg, char* foo, char* bar) { pkg_sums(); return 1; } +static int ki_pkg_summary(sip_msg_t* msg) +{ + pkg_sums(); + return 1; +} + static int dbg_shm_summary(struct sip_msg* msg, char* foo, char* bar) { shm_sums(); return 1; } +static int ki_shm_summary(sip_msg_t* msg) +{ + shm_sums(); + return 1; +} + static int cfg_lock_helper(str *lkey, int mode) { unsigned int pos; @@ -967,6 +998,31 @@ static sr_kemi_t sr_kemi_cfgutils_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("cfgutils"), str_init("abort"), + SR_KEMIP_INT, ki_abort, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("cfgutils"), str_init("pkg_status"), + SR_KEMIP_INT, ki_pkg_status, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("cfgutils"), str_init("shm_status"), + SR_KEMIP_INT, ki_shm_status, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("cfgutils"), str_init("pkg_summary"), + SR_KEMIP_INT, ki_pkg_summary, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("cfgutils"), str_init("shm_summary"), + SR_KEMIP_INT, ki_shm_summary, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

[kamailio/kamailio] Call and Voice issues (#1151)
by Abdo Ali Amer Ismail 16 Jun '17

16 Jun '17

### Description Hello! I'm beginner, and i have installed Kamailio Proxy SIP Server on Ubuntu 14.04.5 LTS and using it to register many SIP Servers (Asterisk) I have some issues: 1- When i call another extension in not ringing. 2- Sometimes ringing but when call is get answered there is no voice. 3- I need to receive inbound calls from my Trunks, but i did not know how to make my proxy able to manage it. 4- I need to call some futures codes like (*45 & 555) but it is unable to call. Thanks to all #### My "kamailio.cfg": ```#!KAMAILIO #!define WITH_TLS #!define WITH_MYSQL #!define WITH_AUTH #!define WITH_USRLOCDB #!define WITH_MULTIDOMAIN #!define WITH_PSTN # Kamailio (OpenSER) SIP Server v5.0 - default configuration script # - web: http://www.kamailio.org` # - git: http://sip-router.org # # Direct your questions about this file to: <sr-users(a)lists.sip-router.org> # # Refer to the Core CookBook at http://www.kamailio.org/wiki/ # for an explanation of possible statements, functions and parameters. # # Note: the comments can be: # - lines starting with #, but not the pre-processor directives, # which start with #!, like #!define, #!ifdef, #!endif, #!else, #!trydef, # #!subst, #!substdef, ... # - lines starting with // # - blocks enclosed in between /* */ # # Several features can be enabled using '#!define WITH_FEATURE' directives: # # *** To run in debug mode: # - define WITH_DEBUG # # *** To enable mysql: # - define WITH_MYSQL # # *** To enable authentication execute: # - enable mysql # - define WITH_AUTH # - add users using 'kamctl' # # *** To enable IP authentication execute: # - enable mysql # - enable authentication # - define WITH_IPAUTH # - add IP addresses with group id '1' to 'address' table # # *** To enable persistent user location execute: # - enable mysql # - define WITH_USRLOCDB # # *** To enable presence server execute: # - enable mysql # - define WITH_PRESENCE # # *** To enable nat traversal execute: # - define WITH_NAT # - install RTPProxy: http://www.rtpproxy.org # - start RTPProxy: # rtpproxy -l _your_public_ip_ -s udp:localhost:7722 # - option for NAT SIP OPTIONS keepalives: WITH_NATSIPPING # # *** To enable PSTN gateway routing execute: # - define WITH_PSTN # - set the value of pstn.gw_ip # - check route[PSTN] for regexp routing condition # # *** To enable database aliases lookup execute: # - enable mysql # - define WITH_ALIASDB # # *** To enable speed dial lookup execute: # - enable mysql # - define WITH_SPEEDDIAL # # *** To enable multi-domain support execute: # - enable mysql # - define WITH_MULTIDOMAIN # # *** To enable TLS support execute: # - adjust CFGDIR/tls.cfg as needed # - define WITH_TLS # # *** To enable XMLRPC support execute: # - define WITH_XMLRPC # - adjust route[XMLRPC] for access policy # # *** To enable anti-flood detection execute: # - adjust pike and htable=>ipban settings as needed (default is # block if more than 16 requests in 2 seconds and ban for 300 seconds) # - define WITH_ANTIFLOOD # # *** To block 3XX redirect replies execute: # - define WITH_BLOCK3XX # # *** To block 401 and 407 authentication replies execute: # - define WITH_BLOCK401407 # # *** To enable VoiceMail routing execute: # - define WITH_VOICEMAIL # - set the value of voicemail.srv_ip # - adjust the value of voicemail.srv_port # # *** To enhance accounting execute: # - enable mysql # - define WITH_ACCDB # - add following columns to database #!ifdef ACCDB_COMMENT ALTER TABLE acc ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN src_ip varchar(64) NOT NULL default ''; ALTER TABLE acc ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_ip varchar(64) NOT NULL default ''; ALTER TABLE missed_calls ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; #!endif ####### Include Local Config If Exists ######### import_file "kamailio-local.cfg" ####### Defined Values ######### # *** Value defines - IDs used later in config #!ifdef WITH_MYSQL # - database URL - used to connect to database server by modules such # as: auth_db, acc, usrloc, a.s.o. #!ifndef DBURL #!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio" #!endif #!endif #!ifdef WITH_MULTIDOMAIN # - the value for 'use_domain' parameters #!define MULTIDOMAIN 1 #!else #!define MULTIDOMAIN 0 #!endif # - flags # FLT_ - per transaction (message) flags # FLB_ - per branch flags #!define FLT_ACC 1 #!define FLT_ACCMISSED 2 #!define FLT_ACCFAILED 3 #!define FLT_NATS 5 #!define FLB_NATB 6 #!define FLB_NATSIPPING 7 ####### Global Parameters ######### ### LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR #!ifdef WITH_DEBUG debug=4 log_stderror=yes #!else debug=2 log_stderror=no #!endif memdbg=5 memlog=5 log_facility=LOG_LOCAL0 /* number of SIP routing processes */ children=8 /* uncomment the next line to disable TCP (default on) */ # disable_tcp=yes /* uncomment the next line to disable the auto discovery of local aliases * based on reverse DNS on IPs (default on) */ # auto_aliases=yes /* add local domain aliases */ /* uncomment and configure the following line if you want Kamailio to * bind on a specific interface/port/proto (default bind on all available) */ /* # listen=udp:10.0.0.10:5060 */ listen=udp:127.0.0.1:6000 listen=udp:XXX.XXX.XXX.XXX:6000 listen=tls:XXX.XXX.XXX.XXX:5061 /* port to listen to (default 5060 for udp, tcp, scrtp, or 5061 for tls)*/ # port=5060 #!ifdef WITH_TLS enable_tls=yes #!endif /* life time of TCP connection when there is no traffic * - a bit higher than registration expires to cope with UA behind NAT */ tcp_connection_lifetime=3605 ####### Custom Parameters ######### /* These parameters can be modified runtime via RPC interface * - see the documentation of 'cfg_rpc' module. * * Format: group.id = value 'desc' description * Access: $sel(cfg_get.group.id) or @cfg_get.group.id */ #!ifdef WITH_PSTN /* PSTN GW Routing * * - pstn.gw_ip: valid IP or hostname as string value, example: * pstn.gw_ip = "10.0.0.101" desc "My PSTN GW Address" * * - by default is empty to avoid misrouting */ pstn.gw_ip = "XXX.XXX.XXX.XXX" desc "PSTN GW Address" pstn.gw_port = "5060" desc "PSTN GW Port" #!endif #!ifdef WITH_VOICEMAIL /* VoiceMail Routing on offline, busy or no answer * * - by default Voicemail server IP is empty to avoid misrouting */ voicemail.srv_ip = "" desc "VoiceMail IP Address" voicemail.srv_port = "5060" desc "VoiceMail Port" #!endif ####### Modules Section ######## /* set paths to location of modules */ # mpath="/usr/local//lib64/kamailio/modules/" #!ifdef WITH_MYSQL loadmodule "db_mysql.so" #!endif loadmodule "jsonrpcs.so" loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "maxfwd.so" loadmodule "usrloc.so" loadmodule "registrar.so" loadmodule "textops.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "acc.so" loadmodule "counters.so" #!ifdef WITH_AUTH loadmodule "auth.so" loadmodule "auth_db.so" #!ifdef WITH_IPAUTH loadmodule "permissions.so" #!endif #!endif #!ifdef WITH_ALIASDB loadmodule "alias_db.so" #!endif #!ifdef WITH_SPEEDDIAL loadmodule "speeddial.so" #!endif #!ifdef WITH_MULTIDOMAIN loadmodule "domain.so" #!endif #!ifdef WITH_PRESENCE loadmodule "presence.so" loadmodule "presence_xml.so" #!endif #!ifdef WITH_NAT loadmodule "nathelper.so" loadmodule "rtpproxy.so" #!endif #!ifdef WITH_TLS loadmodule "tls.so" #!endif #!ifdef WITH_ANTIFLOOD loadmodule "htable.so" loadmodule "pike.so" #!endif #!ifdef WITH_XMLRPC loadmodule "xmlrpc.so" #!endif #!ifdef WITH_DEBUG loadmodule "debugger.so" #!endif # ----------------- setting module-specific parameters --------------- # ----- jsonrpcs params ----- modparam("jsonrpcs", "pretty_format", 1) /* set the path to RPC fifo control file */ # modparam("jsonrpcs", "fifo_name", "/var/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ # modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") # ----- ctl params ----- /* set the path to RPC unix socket control file */ # modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") # ----- tm params ----- # auto-discard branches from previous serial forking leg modparam("tm", "failure_reply_mode", 3) # default retransmission timeout: 30sec modparam("tm", "fr_timer", 30000) # default invite retransmission timeout after 1xx: 120sec modparam("tm", "fr_inv_timer", 120000) # ----- rr params ----- # set next param to 1 to add value to ;lr param (helps with some UAs) modparam("rr", "enable_full_lr", 0) # do not append from tag to the RR (no need for this script) modparam("rr", "append_fromtag", 0) # ----- registrar params ----- modparam("registrar", "method_filtering", 1) /* uncomment the next line to disable parallel forking via location */ # modparam("registrar", "append_branches", 0) /* uncomment the next line not to allow more than 10 contacts per AOR */ # modparam("registrar", "max_contacts", 10) /* max value for expires of registrations */ modparam("registrar", "max_expires", 3600) /* set it to 1 to enable GRUU */ modparam("registrar", "gruu_enabled", 0) # ----- acc params ----- /* what special events should be accounted ? */ modparam("acc", "early_media", 0) modparam("acc", "report_ack", 0) modparam("acc", "report_cancels", 0) /* by default ww do not adjust the direct of the sequential requests. * if you enable this parameter, be sure the enable "append_fromtag" * in "rr" module */ modparam("acc", "detect_direction", 0) /* account triggers (flags) */ modparam("acc", "log_flag", FLT_ACC) modparam("acc", "log_missed_flag", FLT_ACCMISSED) modparam("acc", "log_extra", "src_user=$fU;src_domain=$fd;src_ip=$si;" "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") modparam("acc", "failed_transaction_flag", FLT_ACCFAILED) /* enhanced DB accounting */ #!ifdef WITH_ACCDB modparam("acc", "db_flag", FLT_ACC) modparam("acc", "db_missed_flag", FLT_ACCMISSED) modparam("acc", "db_url", DBURL) modparam("acc", "db_extra", "src_user=$fU;src_domain=$fd;src_ip=$si;" "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") #!endif # ----- usrloc params ----- /* enable DB persistency for location entries */ #!ifdef WITH_USRLOCDB modparam("usrloc", "db_url", DBURL) modparam("usrloc", "db_mode", 2) modparam("usrloc", "use_domain", MULTIDOMAIN) #!endif # ----- auth_db params ----- #!ifdef WITH_AUTH modparam("auth_db", "db_url", DBURL) modparam("auth_db", "calculate_ha1", yes) modparam("auth_db", "password_column", "password") modparam("auth_db", "load_credentials", "") modparam("auth_db", "use_domain", MULTIDOMAIN) # ----- permissions params ----- #!ifdef WITH_IPAUTH modparam("permissions", "db_url", DBURL) modparam("permissions", "db_mode", 1) #!endif #!endif # ----- alias_db params ----- #!ifdef WITH_ALIASDB modparam("alias_db", "db_url", DBURL) modparam("alias_db", "use_domain", MULTIDOMAIN) #!endif # ----- speeddial params ----- #!ifdef WITH_SPEEDDIAL modparam("speeddial", "db_url", DBURL) modparam("speeddial", "use_domain", MULTIDOMAIN) #!endif # ----- domain params ----- #!ifdef WITH_MULTIDOMAIN modparam("domain", "db_url", DBURL) /* register callback to match myself condition with domains list */ modparam("domain", "register_myself", 1) #!endif #!ifdef WITH_PRESENCE # ----- presence params ----- modparam("presence", "db_url", DBURL) # ----- presence_xml params ----- modparam("presence_xml", "db_url", DBURL) modparam("presence_xml", "force_active", 1) #!endif #!ifdef WITH_NAT # ----- rtpproxy params ----- modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") # ----- nathelper params ----- modparam("nathelper", "natping_interval", 30) modparam("nathelper", "ping_nated_only", 1) modparam("nathelper", "sipping_bflag", FLB_NATSIPPING) modparam("nathelper", "sipping_from", "sip:pinger@kamailio.org") # params needed for NAT traversal in other modules modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") modparam("usrloc", "nat_bflag", FLB_NATB) #!endif #!ifdef WITH_TLS # ----- tls params ----- modparam("tls", "config", "/usr/local//etc/kamailio/tls.cfg") #!endif #!ifdef WITH_ANTIFLOOD # ----- pike params ----- modparam("pike", "sampling_time_unit", 2) modparam("pike", "reqs_density_per_unit", 16) modparam("pike", "remove_latency", 4) # ----- htable params ----- /* ip ban htable with autoexpire after 5 minutes */ modparam("htable", "htable", "ipban=>size=8;autoexpire=300;") #!endif #!ifdef WITH_XMLRPC # ----- xmlrpc params ----- modparam("xmlrpc", "route", "XMLRPC"); modparam("xmlrpc", "url_match", "^/RPC") #!endif #!ifdef WITH_DEBUG # ----- debugger params ----- modparam("debugger", "cfgtrace", 1) modparam("debugger", "log_level_name", "exec") #!endif ####### Routing Logic ######## /* Main SIP request routing logic * - processing of any incoming SIP request starts with this route * - note: this is the same as route { ... } */ request_route { # per request initial checks route(REQINIT); # NAT detection route(NATDETECT); # CANCEL processing if (is_method("CANCEL")) { if (t_check_trans()) { route(RELAY); } exit; } # handle requests within SIP dialogs route(WITHINDLG); ### only initial requests (no To tag) # handle retransmissions if(t_precheck_trans()) { t_check_trans(); exit; } t_check_trans(); # authentication route(AUTH); # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); if (is_method("INVITE|SUBSCRIBE")) { record_route(); } # account only INVITEs if (is_method("INVITE")) { setflag(FLT_ACC); # do accounting } # dispatch requests to foreign domains route(SIPOUT); ### requests for my local domains # handle presence related requests route(PRESENCE); # handle registrations route(REGISTRAR); if ($rU==$null) { # request with no Username in RURI sl_send_reply("484","Address Incomplete"); exit; } # dispatch destinations to PSTN route(PSTN); # user location service route(LOCATION); } # Wrapper for relaying requests route[RELAY] { # enable additional event routes for forwarded requests # - serial forking, RTP relaying handling, a.s.o. if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE")) { if(!t_is_set("branch_route")) t_on_branch("MANAGE_BRANCH"); } if (is_method("INVITE|SUBSCRIBE|UPDATE")) { if(!t_is_set("onreply_route")) t_on_reply("MANAGE_REPLY"); } if (is_method("INVITE")) { if(!t_is_set("failure_route")) t_on_failure("MANAGE_FAILURE"); } if (!t_relay()) { sl_reply_error(); } exit; } # Per SIP request initial checks route[REQINIT] { #!ifdef WITH_ANTIFLOOD # flood detection from same IP and traffic ban for a while # be sure you exclude checking trusted peers, such as pstn gateways # - local host excluded (e.g., loop to self) if(src_ip!=myself) { if($sht(ipban=>$si)!=$null) { # ip is already blocked xdbg("request from blocked IP - $rm from $fu (IP:$si:$sp)\n"); exit; } if (!pike_check_req()) { xlog("L_ALERT","ALERT: pike blocking $rm from $fu (IP:$si:$sp)\n"); $sht(ipban=>$si) = 1; exit; } } if($ua =~ "friendly-scanner|sipcli") { # silent drop for scanners - uncomment next line if want to reply # sl_send_reply("200", "OK"); exit; } #!endif if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops"); exit; } if(is_method("OPTIONS") && uri==myself && $rU==$null) { sl_send_reply("200","Keepalive"); exit; } if(!sanity_check("1511", "7")) { xlog("Malformed SIP message from $si:$sp\n"); exit; } } # Handle requests within SIP dialogs route[WITHINDLG] { if (!has_totag()) return; # sequential request withing a dialog should # take the path determined by record-routing if (loose_route()) { route(DLGURI); if (is_method("BYE")) { setflag(FLT_ACC); # do accounting ... setflag(FLT_ACCFAILED); # ... even if the transaction fails } else if ( is_method("ACK") ) { # ACK is forwarded statelessy route(NATMANAGE); } else if ( is_method("NOTIFY") ) { # Add Record-Route for in-dialog NOTIFY as per RFC 6665. record_route(); } route(RELAY); exit; } if (is_method("SUBSCRIBE") && uri == myself) { # in-dialog subscribe requests route(PRESENCE); exit; } if ( is_method("ACK") ) { if ( t_check_trans() ) { # no loose-route, but stateful ACK; # must be an ACK after a 487 # or e.g. 404 from upstream server route(RELAY); exit; } else { # ACK without matching transaction ... ignore and discard exit; } } sl_send_reply("404","Not here"); exit; } # Handle SIP registrations route[REGISTRAR] { if (!is_method("REGISTER")) return; if(isflagset(FLT_NATS)) { setbflag(FLB_NATB); #!ifdef WITH_NATSIPPING # do SIP NAT pinging setbflag(FLB_NATSIPPING); #!endif } if (!save("location")) { sl_reply_error(); } exit; } # User location service route[LOCATION] { #!ifdef WITH_SPEEDDIAL # search for short dialing - 2-digit extension if($rU=~"^[0-9][0-9]$") { if(sd_lookup("speed_dial")) { route(SIPOUT); } } #!endif #!ifdef WITH_ALIASDB # search in DB-based aliases if(alias_db_lookup("dbaliases")) { route(SIPOUT); } #!endif $avp(oexten) = $rU; if (!lookup("location")) { $var(rc) = $rc; route(TOVOICEMAIL); t_newtran(); switch ($var(rc)) { case -1: case -3: send_reply("404", "Not Found"); exit; case -2: send_reply("405", "Method Not Allowed"); exit; } } # when routing via usrloc, log the missed calls also if (is_method("INVITE")) { setflag(FLT_ACCMISSED); } route(RELAY); exit; } # Presence server processing route[PRESENCE] { if(!is_method("PUBLISH|SUBSCRIBE")) return; if(is_method("SUBSCRIBE") && $hdr(Event)=="message-summary") { route(TOVOICEMAIL); # returns here if no voicemail server is configured sl_send_reply("404", "No voicemail service"); exit; } #!ifdef WITH_PRESENCE if (!t_newtran()) { sl_reply_error(); exit; } if(is_method("PUBLISH")) { handle_publish(); t_release(); } else if(is_method("SUBSCRIBE")) { handle_subscribe(); t_release(); } exit; #!endif # if presence enabled, this part will not be executed if (is_method("PUBLISH") || $rU==$null) { sl_send_reply("404", "Not here"); exit; } return; } # IP authorization and user authentication route[AUTH] { #!ifdef WITH_AUTH #!ifdef WITH_IPAUTH if((!is_method("REGISTER")) && allow_source_address()) { # source IP allowed return; } #!endif if (is_method("REGISTER") || from_uri==myself) { # authenticate requests if (!auth_check("$fd", "subscriber", "1")) { auth_challenge("$fd", "0"); exit; } # user authenticated - remove auth header if(!is_method("REGISTER|PUBLISH")) consume_credentials(); } # if caller is not local subscriber, then check if it calls # a local destination, otherwise deny, not an open relay here if (from_uri!=myself && uri!=myself) { sl_send_reply("403","Not relaying"); exit; } #!endif return; } # Caller NAT detection route[NATDETECT] { #!ifdef WITH_NAT force_rport(); if (nat_uac_test("19")) { if (is_method("REGISTER")) { fix_nated_register(); } else { if(is_first_hop()) { set_contact_alias(); } } setflag(FLT_NATS); } #!endif return; } # RTPProxy control and signaling updates for NAT traversal route[NATMANAGE] { #!ifdef WITH_NAT if (is_request()) { if(has_totag()) { if(check_route_param("nat=yes")) { setbflag(FLB_NATB); } } } if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) return; if(nat_uac_test("8")) { rtpproxy_manage("co"); } else { rtpproxy_manage("cor"); } if (is_request()) { if (!has_totag()) { if(t_is_branch_route()) { add_rr_param(";nat=yes"); } } } if (is_reply()) { if(isbflagset(FLB_NATB)) { if(is_first_hop()) set_contact_alias(); } } #!endif return; } # URI update for dialog requests route[DLGURI] { #!ifdef WITH_NAT if(!isdsturiset()) { handle_ruri_alias(); } #!endif return; } # Routing to foreign domains route[SIPOUT] { if (uri==myself) return; append_hf("P-hint: outbound\r\n"); route(RELAY); exit; } # PSTN GW routing route[PSTN] { #!ifdef WITH_PSTN # check if PSTN GW IP is defined if (strempty($sel(cfg_get.pstn.gw_ip))) { xlog("SCRIPT: PSTN routing enabled but pstn.gw_ip not defined\n"); return; } # route to PSTN dialed numbers starting with '+' or '00' # (international format) # - update the condition to match your dialing rules for PSTN routing if(!($rU=~"^(\+|00)[1-9][0-9]{3,20}$")) return; # only local users allowed to call if(from_uri!=myself) { sl_send_reply("403", "Not Allowed"); exit; } if (strempty($sel(cfg_get.pstn.gw_port))) { $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip); } else { $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip) + ":" + $sel(cfg_get.pstn.gw_port); } route(RELAY); exit; #!endif return; } # XMLRPC routing #!ifdef WITH_XMLRPC route[XMLRPC] { # allow XMLRPC from localhost if ((method=="POST" || method=="GET") && (src_ip==127.0.0.1)) { # close connection only for xmlrpclib user agents (there is a bug in # xmlrpclib: it waits for EOF before interpreting the response). if ($hdr(User-Agent) =~ "xmlrpclib") set_reply_close(); set_reply_no_connect(); dispatch_rpc(); exit; } send_reply("403", "Forbidden"); exit; } #!endif # Routing to voicemail server route[TOVOICEMAIL] { #!ifdef WITH_VOICEMAIL if(!is_method("INVITE|SUBSCRIBE")) return; # check if VoiceMail server IP is defined if (strempty($sel(cfg_get.voicemail.srv_ip))) { xlog("SCRIPT: VoiceMail routing enabled but IP not defined\n"); return; } if(is_method("INVITE")) { if($avp(oexten)==$null) return; $ru = "sip:" + $avp(oexten) + "@" + $sel(cfg_get.voicemail.srv_ip) + ":" + $sel(cfg_get.voicemail.srv_port); } else { if($rU==$null) return; $ru = "sip:" + $rU + "@" + $sel(cfg_get.voicemail.srv_ip) + ":" + $sel(cfg_get.voicemail.srv_port); } route(RELAY); exit; #!endif return; } # Manage outgoing branches branch_route[MANAGE_BRANCH] { xdbg("new branch [$T_branch_idx] to $ru\n"); route(NATMANAGE); } # Manage incoming replies onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); if(status=~"[12][0-9][0-9]") { route(NATMANAGE); } } # Manage failure routing cases failure_route[MANAGE_FAILURE] { route(NATMANAGE); if (t_is_canceled()) exit; #!ifdef WITH_BLOCK3XX # block call redirect based on 3xx replies. if (t_check_status("3[0-9][0-9]")) { t_reply("404","Not found"); exit; } #!endif #!ifdef WITH_BLOCK401407 # block call redirect based on 401, 407 replies. if (t_check_status("401|407")) { t_reply("404","Not found"); exit; } #!endif #!ifdef WITH_VOICEMAIL # serial forking # - route to voicemail on busy or no answer (timeout) if (t_check_status("486|408")) { $du = $null; route(TOVOICEMAIL); exit; } #!endif }` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1151

2 2

Kamailio v4.4.6 Released
by Daniel-Constantin Mierla 16 Jun '17

16 Jun '17

Hello, Kamailio SIP Server v4.4.6 stable release is out. This is a maintenance release of the latest stable branch, 4.4, that includes fixes since the release of v4.4.5. There is no change to database schema or configuration language structure that you have to do on previous installations of v4.4.x. Deployments running previous v4.x.x versions are strongly recommended to be upgraded to v4.4.6. For more details about version 4.4.6 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2017/06/kamailio-v4-4-6-released/ RPM, Debian/Ubuntu packages will be available soon as well. Note: the latest stable branch is 5.0, at this moment with its latest release v5.0.2. See more details about it at: * https://www.kamailio.org/w/kamailio-v5-0-0-release-notes/ Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 0

git:4.4:becbde42: ChangeLog: new content updated for v4.4.6
by Daniel-Constantin Mierla 16 Jun '17

16 Jun '17

Module: kamailio Branch: 4.4 Commit: becbde4270a0bec3280e588fd0e4b537f12b23b9 URL: https://github.com/kamailio/kamailio/commit/becbde4270a0bec3280e588fd0e4b53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-16T12:01:40+02:00 ChangeLog: new content updated for v4.4.6 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/becbde4270a0bec3280e588fd0e4b53… Patch: https://github.com/kamailio/kamailio/commit/becbde4270a0bec3280e588fd0e4b53… --- diff --git a/ChangeLog b/ChangeLog index afd3c43712..a30faeaa54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,21 @@ ===================== Changes Since Version 4.4.5 =========================== +commit 3ee232257fbd956b85fa23cf3a5f8766fabd6889 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Fri Jun 16 11:54:53 2017 +0200 + + ratelimit: removed unused variable + +commit b5a4c125117d46e682595b04b22a6f850ba88087 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Fri Jun 16 11:49:28 2017 +0200 + + mtree: avoid char array access over the size + + (cherry picked from commit 24718a4f0a7579abf9f32967cce2b86e5973cc6d) + (cherry picked from commit 2d1dc7cfcde0410e44a8d53849c319c9d234a7b3) + commit 2634a759e8493ebd4f7ce8cbf467d4bf03f5eb71 Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jun 16 11:04:06 2017 +0200

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2017