sr-dev June 2021

sr-dev@lists.kamailio.org

15 participants
313 discussions

[kamailio/kamailio] nats: new nats message consumer module (#2790)
by Emmanuel Schmidbauer 28 Jun '21

28 Jun '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  New Module to consume messages from NATS messaging system. Initial Features: - automatic reconnect with connected/disconnected event routes - connect to up to 10 NATS URLs - subscribe to any number of subjects - receive messages via event route You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2790 -- Commit Summary -- * nats: new nats message consumer module -- File Changes -- A src/modules/nats/Makefile (16) A src/modules/nats/doc/Makefile (4) A src/modules/nats/doc/nats.xml (42) A src/modules/nats/doc/nats_admin.xml (207) A src/modules/nats/nats_mod.c (569) A src/modules/nats/nats_mod.h (99) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2790.patch https://github.com/kamailio/kamailio/pull/2790.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/2790

7 9

git:master:480969f2: Merge pull request #2790 from kamailio/nats-module
by GitHub 28 Jun '21

28 Jun '21

Module: kamailio Branch: master Commit: 480969f28d2b539b31df5d4ff292c0ab95f30d17 URL: https://github.com/kamailio/kamailio/commit/480969f28d2b539b31df5d4ff292c0a… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-06-28T06:44:52-04:00 Merge pull request #2790 from kamailio/nats-module nats: new nats message consumer module --- Added: src/modules/nats/Makefile Added: src/modules/nats/doc/Makefile Added: src/modules/nats/doc/nats.xml Added: src/modules/nats/doc/nats_admin.xml Added: src/modules/nats/nats_mod.c Added: src/modules/nats/nats_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/480969f28d2b539b31df5d4ff292c0a… Patch: https://github.com/kamailio/kamailio/commit/480969f28d2b539b31df5d4ff292c0a…

1 0

git:master:6078dbf6: nats: new nats message consumer module
by Emmanuel Schmidbauer 28 Jun '21

28 Jun '21

Module: kamailio Branch: master Commit: 6078dbf6a7aa8eac8c3c4a57d939716f232799f5 URL: https://github.com/kamailio/kamailio/commit/6078dbf6a7aa8eac8c3c4a57d939716… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Date: 2021-06-27T07:58:58-04:00 nats: new nats message consumer module --- Added: src/modules/nats/Makefile Added: src/modules/nats/doc/Makefile Added: src/modules/nats/doc/nats.xml Added: src/modules/nats/doc/nats_admin.xml Added: src/modules/nats/nats_mod.c Added: src/modules/nats/nats_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/6078dbf6a7aa8eac8c3c4a57d939716… Patch: https://github.com/kamailio/kamailio/commit/6078dbf6a7aa8eac8c3c4a57d939716…

1 0

[kamailio/kamailio] built warning (#2787)
by sergey-safarov 26 Jun '21

26 Jun '21

**defined but not used** ``` rtpproxy.c:943:1: warning: ‘rp_extract_mediaip’ defined but not used [-Wunused-function] rp_extract_mediaip(str *body, str *mediaip, int *pf, char *line) ^~~~~~~~~~~~~~~~~~ CC (gcc) [M rtpproxy.so] rtpproxy_db.o make[3]: 'libsrdb1.so.1.0' is up to date. ``` -- 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/2787

2 2

git:master:14d92c0d: rtpproxy: removed unused rp_extract_mediaip()
by Daniel-Constantin Mierla 26 Jun '21

26 Jun '21

Module: kamailio Branch: master Commit: 14d92c0d7ab1229996176b131ab8edcabc3a5717 URL: https://github.com/kamailio/kamailio/commit/14d92c0d7ab1229996176b131ab8edc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-26T07:05:29+02:00 rtpproxy: removed unused rp_extract_mediaip() - GH #2787 --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/14d92c0d7ab1229996176b131ab8edc… Patch: https://github.com/kamailio/kamailio/commit/14d92c0d7ab1229996176b131ab8edc… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 733ea3cec8..bd2eb5368d 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -114,7 +114,6 @@ static str DEFAULT_RTPP_SET_ID_STR = str_init("0"); #define PTL_CPROTOVER "20081102" #define CPORT "22222" -static int rp_extract_mediaip(str *, str *, int *, char *); static int alter_mediaip(struct sip_msg *, str *, str *, int, str *, int, int); static int alter_mediaport(struct sip_msg *, str *, str *, str *, int); static int alter_rtcp(struct sip_msg *msg, str *body, str *oldport, str *newport); @@ -939,61 +938,6 @@ isnulladdr(str *sx, int pf) #define AOLDMEDPRT_LEN (sizeof(AOLDMEDPRT) - 1) - static int -rp_extract_mediaip(str *body, str *mediaip, int *pf, char *line) -{ - char *cp, *cp1; - int len, nextisip; - - cp1 = NULL; - for (cp = body->s; (len = body->s + body->len - cp) > 0;) { - cp1 = ser_memmem(cp, line, len, 2); - if (cp1 == NULL || cp1[-1] == '\n' || cp1[-1] == '\r') - break; - cp = cp1 + 2; - } - if (cp1 == NULL) - return -1; - - mediaip->s = cp1 + 2; - mediaip->len = eat_line(mediaip->s, body->s + body->len - mediaip->s) - - mediaip->s; - trim_len(mediaip->len, mediaip->s, *mediaip); - - nextisip = 0; - for (cp = mediaip->s; cp < mediaip->s + mediaip->len;) { - len = eat_token_end(cp, mediaip->s + mediaip->len) - cp; - if (nextisip == 1) { - mediaip->s = cp; - mediaip->len = len; - nextisip++; - break; - } - if (len == 3 && memcmp(cp, "IP", 2) == 0) { - switch (cp[2]) { - case '4': - nextisip = 1; - *pf = AF_INET; - break; - - case '6': - nextisip = 1; - *pf = AF_INET6; - break; - - default: - break; - } - } - cp = eat_space_end(cp + len, mediaip->s + mediaip->len); - } - if (nextisip != 2 || mediaip->len == 0) { - LM_ERR("no `IP[4|6]' in `%s' field\n",line); - return -1; - } - return 1; -} - static int alter_mediaip(struct sip_msg *msg, str *body, str *oldip, int oldpf, str *newip, int newpf, int preserve)

1 0

[kamailio/kamailio] kazoo: different binding for private module and for current 5.4.5 (#2747)
by sergey-safarov 25 Jun '21

25 Jun '21

### Description I want to use some customization for Kamailio 5.4 branch. Before start I want to make sure 5.4.5 tag works with `kazoo-config-kamailio`. During a tests, I found the `kazoo` module not able to receive registration responses. If I replace `kazoo` module in Kamailio 5.4.5 with to the same version from `2600hz/staging` repo then all as expected. I checked RabbitMQ bindgs for both module and binding different for `kazoo` module from Kamailio 5.4.5 and from `2600hz/staging` repo. I think some commits not published in the Kamailio repo. ### Troubleshooting *binding for kazoo module from Kamailio 5.4.5* ``` root@rmq-2 ~]# rabbitmqctl list_bindings| grep -P "bcf-e-2.la.cal911.net" | sed -e 's/la.cal911.net/example.com/g' exchange kamailio(a)bcf-e-2.example.com-<1-23> queue kamailio(a)bcf-e-2.example.com-<1-23> [] exchange kamailio(a)bcf-e-2.example.com-<1-11> queue kamailio(a)bcf-e-2.example.com-<1-11> [] exchange registrar-sync-bcf-e-2.example.com queue registrar-sync-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-10> queue kamailio(a)bcf-e-2.example.com-<1-10> [] exchange kamailio(a)bcf-e-2.example.com-<1-5> queue kamailio(a)bcf-e-2.example.com-<1-5> [] exchange kamailio(a)bcf-e-2.example.com-<1-18> queue kamailio(a)bcf-e-2.example.com-<1-18> [] exchange kamailio(a)bcf-e-2.example.com-<1-13> queue kamailio(a)bcf-e-2.example.com-<1-13> [] exchange kamailio(a)bcf-e-2.example.com-<1-16> queue kamailio(a)bcf-e-2.example.com-<1-16> [] exchange registrar-flush-bcf-e-2.example.com queue registrar-flush-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-8> queue kamailio(a)bcf-e-2.example.com-<1-8> [] exchange kamailio(a)bcf-e-2.example.com-<1-15> queue kamailio(a)bcf-e-2.example.com-<1-15> [] exchange kamailio(a)bcf-e-2.example.com-<1-14> queue kamailio(a)bcf-e-2.example.com-<1-14> [] exchange kamailio(a)bcf-e-2.example.com-<1-3> queue kamailio(a)bcf-e-2.example.com-<1-3> [] exchange kamailio(a)bcf-e-2.example.com-<1-22> queue kamailio(a)bcf-e-2.example.com-<1-22> [] exchange kamailio(a)bcf-e-2.example.com-<1-0> queue kamailio(a)bcf-e-2.example.com-<1-0> [] exchange kamailio(a)bcf-e-2.example.com-<1-4> queue kamailio(a)bcf-e-2.example.com-<1-4> [] exchange kamailio(a)bcf-e-2.example.com-<1-2> queue kamailio(a)bcf-e-2.example.com-<1-2> [] exchange kamailio(a)bcf-e-2.example.com-<1-20> queue kamailio(a)bcf-e-2.example.com-<1-20> [] exchange kamailio(a)bcf-e-2.example.com-<1-17> queue kamailio(a)bcf-e-2.example.com-<1-17> [] exchange presence-dialog-bcf-e-2.example.com queue presence-dialog-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-6> queue kamailio(a)bcf-e-2.example.com-<1-6> [] exchange nodes-bcf-e-2.example.com queue nodes-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-19> queue kamailio(a)bcf-e-2.example.com-<1-19> [] exchange kamailio(a)bcf-e-2.example.com-<1-24> queue kamailio(a)bcf-e-2.example.com-<1-24> [] exchange MSG-QUEUE-bcf-e-2.example.com queue MSG-QUEUE-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-21> queue kamailio(a)bcf-e-2.example.com-<1-21> [] exchange kamailio(a)bcf-e-2.example.com-<1-1> queue kamailio(a)bcf-e-2.example.com-<1-1> [] exchange presence-api-bcf-e-2.example.com queue presence-api-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-12> queue kamailio(a)bcf-e-2.example.com-<1-12> [] exchange kamailio(a)bcf-e-2.example.com-<1-9> queue kamailio(a)bcf-e-2.example.com-<1-9> [] exchange kamailio(a)bcf-e-2.example.com-<1-7> queue kamailio(a)bcf-e-2.example.com-<1-7> [] im exchange MSG-QUEUE-bcf-e-2.example.com queue sms.outbound.kamailio%40bcf-e-2%2Eexample%2Ecom.* [] nodes exchange nodes-bcf-e-2.example.com queue [] presence exchange presence-dialog-bcf-e-2.example.com queue dialog.*.* [] presence exchange presence-dialog-bcf-e-2.example.com queue mwi_updates.*.* [] presence exchange presence-api-bcf-e-2.example.com queue presence.reset.*.* [] presence exchange presence-api-bcf-e-2.example.com queue presence.search_req.* [] presence exchange presence-dialog-bcf-e-2.example.com queue update.*.* [] registrar exchange registrar-flush-bcf-e-2.example.com queue registration.flush.* [] registrar exchange registrar-sync-bcf-e-2.example.com queue registration.sync [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-0> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-0 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-1> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-1 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-10> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-10 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-11> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-11 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-12> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-12 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-13> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-13 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-14> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-14 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-15> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-15 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-16> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-16 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-17> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-17 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-18> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-18 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-19> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-19 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-2> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-2 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-20> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-20 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-21> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-21 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-22> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-22 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-23> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-23 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-24> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-24 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-3> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-3 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-4> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-4 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-5> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-5 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-6> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-6 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-7> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-7 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-8> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-8 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-9> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-9 [] ``` *binding for kazoo module from 2600hz/staging repo* ``` [root@rmq-2 ~]# rabbitmqctl list_bindings| grep -P "bcf-e-2.la.cal911.net" | sed -e 's/la.cal911.net/example.com/g' exchange registrar-sync-bcf-e-2.example.com queue registrar-sync-bcf-e-2.example.com [] exchange registrar-flush-bcf-e-2.example.com queue registrar-flush-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-default<..> queue kamailio(a)bcf-e-2.example.com-default<..> [] exchange presence-dialog-bcf-e-2.example.com queue presence-dialog-bcf-e-2.example.com [] exchange nodes-bcf-e-2.example.com queue nodes-bcf-e-2.example.com [] exchange MSG-QUEUE-bcf-e-2.example.com queue MSG-QUEUE-bcf-e-2.example.com [] exchange presence-api-bcf-e-2.example.com queue presence-api-bcf-e-2.example.com [] im exchange MSG-QUEUE-bcf-e-2.example.com queue sms.outbound.kamailio%40bcf-e-2%2Eexample%2Ecom.* [] nodes exchange nodes-bcf-e-2.example.com queue [] presence exchange presence-dialog-bcf-e-2.example.com queue dialog.*.* [] presence exchange presence-dialog-bcf-e-2.example.com queue mwi_updates.*.* [] presence exchange presence-api-bcf-e-2.example.com queue presence.reset.*.* [] presence exchange presence-api-bcf-e-2.example.com queue presence.search_req.* [] presence exchange presence-dialog-bcf-e-2.example.com queue update.*.* [] registrar exchange registrar-flush-bcf-e-2.example.com queue registration.flush.* [] registrar exchange registrar-sync-bcf-e-2.example.com queue registration.sync [] targeted exchange kamailio(a)bcf-e-2.example.com-default<..> queue kamailio(a)bcf-e-2.example.com-default<..> [] ``` #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` @lazedo could you look at why the stock `kazoo` module uses the different binding. -- 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/2747

2 4

git:master:d2369fa7: pv: added {s.fmtlines, n, m} and {s.fmtlinet, n, m}
by Daniel-Constantin Mierla 25 Jun '21

25 Jun '21

Module: kamailio Branch: master Commit: d2369fa78c63994a35a965ffbc2b7d9a189a00df URL: https://github.com/kamailio/kamailio/commit/d2369fa78c63994a35a965ffbc2b7d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-25T10:58:23+02:00 pv: added {s.fmtlines,n,m} and {s.fmtlinet,n,m} - format the value in lines of n characters, adding m spaces or tabs to the start of each new line (not to first line) --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/d2369fa78c63994a35a965ffbc2b7d9… Patch: https://github.com/kamailio/kamailio/commit/d2369fa78c63994a35a965ffbc2b7d9…

1 0

git:master:3a7f6c18: pv: added {s.rafter, x} and {s.rbefore, x}
by Daniel-Constantin Mierla 25 Jun '21

25 Jun '21

Module: kamailio Branch: master Commit: 3a7f6c18810cb307332fbf061a248252996b0464 URL: https://github.com/kamailio/kamailio/commit/3a7f6c18810cb307332fbf061a24825… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-25T09:51:10+02:00 pv: added {s.rafter,x} and {s.rbefore,x} - similar to {s.after,x} and {s.before,x}, but searches from end of the value --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/3a7f6c18810cb307332fbf061a24825… Patch: https://github.com/kamailio/kamailio/commit/3a7f6c18810cb307332fbf061a24825… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 98cce7caa8..6a026cc9ae 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1340,6 +1340,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, break; case TR_S_BEFORE: + case TR_S_RBEFORE: if(tp==NULL) { LM_ERR("invalid parameters (cfg line: %d)\n", @@ -1366,11 +1367,20 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, } st = v.rs; } - for(i=0; i<val->rs.len; i++) { - if(val->rs.s[i]==st.s[0]) { - break; + if(subtype==TR_S_BEFORE) { + for(i=0; i<val->rs.len; i++) { + if(val->rs.s[i]==st.s[0]) { + break; + } + } + } else { + for(i=val->rs.len-1; i>=0; i++) { + if(val->rs.s[i]==st.s[0]) { + break; + } } } + if(i==0) { _tr_buffer[0] = '\0'; val->rs.len = 0; @@ -1384,6 +1394,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, break; case TR_S_AFTER: + case TR_S_RAFTER: if(tp==NULL) { LM_ERR("invalid parameters (cfg line: %d)\n", @@ -1410,9 +1421,17 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, } st = v.rs; } - for(i=0; i<val->rs.len; i++) { - if(val->rs.s[i]==st.s[0]) { - break; + if(subtype==TR_S_AFTER) { + for(i=0; i<val->rs.len; i++) { + if(val->rs.s[i]==st.s[0]) { + break; + } + } + } else { + for(i=val->rs.len-1; i>=0; i++) { + if(val->rs.s[i]==st.s[0]) { + break; + } } } if(i>=val->rs.len-1) { @@ -3012,6 +3031,46 @@ char* tr_parse_string(str* in, trans_t *t) goto error; } goto done; + } else if(name.len==7 && strncasecmp(name.s, "rbefore", 7)==0) { + t->subtype = TR_S_RBEFORE; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid rbefore transformation: %.*s!\n", + in->len, in->s); + goto error; + } + p++; + _tr_parse_sparamx(p, p0, tp, spec, ps, in, s, 1); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid rbefore transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; + } else if(name.len==6 && strncasecmp(name.s, "rafter", 6)==0) { + t->subtype = TR_S_RAFTER; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid rafter transformation: %.*s!\n", + in->len, in->s); + goto error; + } + p++; + _tr_parse_sparamx(p, p0, tp, spec, ps, in, s, 1); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid rafter transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 4b8e1ff12f..9d474cf08b 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -45,7 +45,7 @@ enum _tr_s_subtype { TR_S_UNBRACKET, TR_S_COUNT, TR_S_ENCODEBASE64T, TR_S_DECODEBASE64T, TR_S_ENCODEBASE64URL, TR_S_DECODEBASE64URL, TR_S_ENCODEBASE64URLT, TR_S_DECODEBASE64URLT, TR_S_RMWS, TR_S_BEFORE, - TR_S_AFTER + TR_S_AFTER, TR_S_RBEFORE, TR_S_RAFTER }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

[kamailio/kamailio] pua_json for KEMI framework (#2783)
by Zhan Bazarov 24 Jun '21

24 Jun '21

Hello everyone, is module pua_json going to be implemented for KEMI framework? I've tried to use KSR.x.modf("pua_json_publish", "json_here") and I'm getting error ### python code ``` def ksr_xhttp_event(self, evmsg, evname): if evname == "xhttp:request": try: KSR.err("===== xhttp module triggered event: " + evname + "\n") if "/presence" in KSR.pv.get("$hu"): rb = json.loads(KSR.kx.get_body()) if rb["Event-Package"] == "message-summary": KSR.info("request received- " + rb["Call-ID"] + "update for: " + rb[ "From"] + "request body: " + json.dumps(rb) + "\n") KSR.x.modf("pua_json_publish", json.dumps(rb)); KSR.xhttp.xhttp_reply(200, "OK", "text/html", "<html><body>Entity state updated</body></html>") return 1 if "/RCP" in KSR.pv.get("$hu"): KSR.jsonrpcs.dispatch() return 1 else: KSR.xhttp.xhttp_reply(200, "OK", "text/html", "<html><body>Wrong URL</body></html>") return 1 except: KSR.err("===== unsupported " + evname + "\n") return -255 ``` #### Debugging Data ``` app_python [python_support.c:154]: python_handle_exception(): apy_exec: ksr_xhttp_event(xhttp:request): Unhandled exception in the Python code: RuntimeError: self is NULL ``` * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.5 (x86_64/linux) c46342 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: c46342 compiled on 14:37:00 Apr 27 2021 with gcc 7.5.0 ``` * **Operating System**:  ``` Linux ip-10-199-240-110 4.15.0-1057-aws #59-Ubuntu SMP Wed Dec 4 10:02:00 UTC 2019 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/2783

2 5

git:5.5:a7007532: tls: info log when libssl is linked static
by Daniel-Constantin Mierla 24 Jun '21

24 Jun '21

Module: kamailio Branch: 5.5 Commit: a7007532ff6d351629bf1467a1e74b29c0125917 URL: https://github.com/kamailio/kamailio/commit/a7007532ff6d351629bf1467a1e74b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-24T18:34:56+02:00 tls: info log when libssl is linked static (cherry picked from commit 365e7e46dfb4f605bafe43b57e37e1ff68077567) --- Modified: src/modules/tls/Makefile Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/a7007532ff6d351629bf1467a1e74b2… Patch: https://github.com/kamailio/kamailio/commit/a7007532ff6d351629bf1467a1e74b2… --- diff --git a/src/modules/tls/Makefile b/src/modules/tls/Makefile index 3b90ec8fd6..32495099c0 100644 --- a/src/modules/tls/Makefile +++ b/src/modules/tls/Makefile @@ -39,6 +39,8 @@ endif # ifneq ($(CRYPTO_BUILDER),) else # $(LIBSSL_STATIC),yes) + DEFS += -DKSR_LIBSSL_STATIC + ifneq ($(LIBSSL_STATIC_SRCLIB),yes) ## when static libs (*.a) from packages are compiled with -fPIC DEFS += $(shell $(SSL_BUILDER) --cflags) diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index b71bbbd28b..4c858bbbd8 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -589,6 +589,10 @@ int tls_pre_init(void) void (*ff)(void *, const char *, int) = NULL; #endif +#ifdef KSR_LIBSSL_STATIC + LM_INFO("libssl linked mode: static\n"); +#endif + /* * this has to be called before any function calling CRYPTO_malloc, * CRYPTO_malloc will set allow_customize in openssl to 0

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2021