sr-dev October 2017

sr-dev@lists.kamailio.org

33 participants
301 discussions

git:5.0:1ecac0c9: sipcapture: add missing or invalid byte order conversion

by Ãyvind Kolbu

Module: kamailio Branch: 5.0 Commit: 1ecac0c9eb4c328c9b69ae048817e1b13813b134 URL: https://github.com/kamailio/kamailio/commit/1ecac0c9eb4c328c9b69ae048817e1b… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:50:47+02:00 sipcapture: add missing or invalid byte order conversion (cherry picked from commit dac238ac3fdf2d0f47d6915508160b8160e9ab11) --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/1ecac0c9eb4c328c9b69ae048817e1b… Patch: https://github.com/kamailio/kamailio/commit/1ecac0c9eb4c328c9b69ae048817e1b… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index 5382e5817e..cd3338317c 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -989,13 +989,14 @@ int hepv3_get_chunk(struct sip_msg *msg, char *buf, unsigned int len, int req_ch case 12: hg->capt_id = (hep_chunk_uint32_t *) (tmp); - ret = pv_get_uintval(msg, param, res, ntohs(hg->capt_id->data)); + ret = pv_get_uintval(msg, param, res, ntohl(hg->capt_id->data)); goto done; case 13: hg->keep_tm = (hep_chunk_uint16_t *) (tmp); - ret = pv_get_uintval(msg, param, res, hg->keep_tm->data); + ret = pv_get_uintval(msg, param, res, ntohs(hg->keep_tm->data)); goto done; + case 14: tmpstr.s = (char *) tmp + sizeof(hep_chunk_t); tmpstr.len = chunk_length - sizeof(hep_chunk_t);

7 years, 1 month

git:5.0:97b5af5d: sipcapture: remove excess byte order conversion

by Ãyvind Kolbu

Module: kamailio Branch: 5.0 Commit: 97b5af5d5ac874c848f698136645dd1b92d0030a URL: https://github.com/kamailio/kamailio/commit/97b5af5d5ac874c848f698136645dd1… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:50:33+02:00 sipcapture: remove excess byte order conversion - buffer pointer `tmp` in hepv3_get_chunk() was assigned to hg->time_(Âµ)sec - therefore everytime route script calls pseudovariables, part of original `buf` was byte converted (cherry picked from commit 6e43bf84a2afc4e83ce33b7a416d7b81f7dd5658) --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/97b5af5d5ac874c848f698136645dd1… Patch: https://github.com/kamailio/kamailio/commit/97b5af5d5ac874c848f698136645dd1…

7 years, 1 month

git:5.0:1e5eb8bb: modules/sipcapture: improve nonsip_hook documentation

by Ãyvind Kolbu

Module: kamailio Branch: 5.0 Commit: 1e5eb8bb8ae5fe4f2a8e8940462bdd67ea760d43 URL: https://github.com/kamailio/kamailio/commit/1e5eb8bb8ae5fe4f2a8e8940462bdd6… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:50:22+02:00 modules/sipcapture: improve nonsip_hook documentation (cherry picked from commit 2f872dcc684a345cff09a437ae4a3767613b5529) --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml Modified: src/modules/sipcapture/examples/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/1e5eb8bb8ae5fe4f2a8e8940462bdd6… Patch: https://github.com/kamailio/kamailio/commit/1e5eb8bb8ae5fe4f2a8e8940462bdd6… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index 8916317cb0..d9d47cceda 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -493,6 +493,26 @@ modparam("sipcapture", "topoh_unmask", 1) </programlisting> </example> </section> + + <section id="sipcapture.p.nonsip_hook"> + <title><varname>nonsip_hook</varname> (int)</title> + <para> + If set to 1, event route <emphasis>sipcapture:siprequest</emphasis> is + run when HEP message is received. + </para> + <para> + Default value is <emphasis>0</emphasis>. + </para> + <example> + <title>Set <varname>nonsip_hook</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sipcapture", "nonsip_hook", 1) +... + </programlisting> + </example> + </section> + </section> <section> <title>Functions</title> diff --git a/src/modules/sipcapture/examples/kamailio.cfg b/src/modules/sipcapture/examples/kamailio.cfg index 3d42a78f47..14a5641a1c 100644 --- a/src/modules/sipcapture/examples/kamailio.cfg +++ b/src/modules/sipcapture/examples/kamailio.cfg @@ -861,10 +861,6 @@ route[STORE] { sip_capture("$var(a)"); } -event_route[sipcapture:request] { - xlog("received sipcapture request from $si:$sp\r\n"); -} - #!ifdef WITH_HOMER_CUSTOM_STATS event_route[xhttp:request] { set_reply_close(); @@ -908,12 +904,14 @@ event_route[xhttp:request] { event_route[sipcapture:request] { - xlog("HEP Request!\n"); - xlog("received sipcapture request from $si:$sp\r\n"); - xlog("HEP VERSION $hep(version) request from $si:$sp\r\n"); - xlog("HEP CHUNK Source IP $hep(0x002) request from $si:$sp\r\n"); + xlog("HEP Request!\n"); + xlog("received sipcapture request from $si:$sp\n"); + xlog("HEP VERSION $hep(version) request from $si:$sp\n"); + xlog("HEP CHUNK Source IP $hep(0x002) request from $si:$sp\n"); + #Is it SIP ? - if($hep(0x00b) == 1){ + if($hep(0x00b) == 1) + { #Do parsing internal return 1; @@ -921,8 +919,8 @@ event_route[sipcapture:request] { else { #If report lets proceed here with payload - xlog("HEP CHUNK PAYLOAD $hep(0x00f) request from $si:$sp\r\n"); - return 0; + xlog("HEP CHUNK PAYLOAD $hep(0x00f) request from $si:$sp\n"); + return 0; } }

7 years, 1 month

[kamailio/kamailio] Sipcapture backport (#1281)

by oyvindkolbu

Backport fixes for sipcapture to 5.0. Important for $hep() to work properly. Mostly from GH #1191 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1281 -- Commit Summary -- * sipcapture: fix HEP3 capture-id >= 2^16 * modules/sipcapture: improve nonsip_hook documentation * sipcapture: remove excess byte order conversion * sipcapture: add missing or invalid byte order conversion * sipcapture: fix custom field variable naming * sipcapture: free allocated process memory before return * sipcapture: keep hep buffer unmodified while getting PV $hep(NNN) * sipcapture: safety checks for values inside w_float2int() * sipcapture: documentation typo -- File Changes -- M src/modules/sipcapture/doc/sipcapture_admin.xml (22) M src/modules/sipcapture/examples/kamailio.cfg (20) M src/modules/sipcapture/hep.c (52) M src/modules/sipcapture/sipcapture.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1281.patch https://github.com/kamailio/kamailio/pull/1281.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/1281

7 years, 1 month

git:5.0:3ffbd379: sipcapture: fix HEP3 capture-id >= 2^16

by Ãyvind Kolbu

Module: kamailio Branch: 5.0 Commit: 3ffbd3796cc8507480ccb666e724725c06b901ca URL: https://github.com/kamailio/kamailio/commit/3ffbd3796cc8507480ccb666e724725… Author: Bastian Triller <btriller(a)broadsoft.com> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:48:45+02:00 sipcapture: fix HEP3 capture-id >= 2^16 (cherry picked from commit dbd57c3eac30e1de54d98eb2ba8f608a17f7adbf) --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/3ffbd3796cc8507480ccb666e724725… Patch: https://github.com/kamailio/kamailio/commit/3ffbd3796cc8507480ccb666e724725… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 7167cf3053..1111b9da65 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -271,7 +271,7 @@ enum hash_source source = hs_error; //unsigned int rr_idx = 0; -struct hep_timehdr* heptime; +struct hep_timeinfo* heptime; /*! \brief * Exported functions @@ -1150,7 +1150,7 @@ static int child_init(int rank) } - heptime = (struct hep_timehdr*)pkg_malloc(sizeof(struct hep_timehdr)); + heptime = (struct hep_timeinfo*)pkg_malloc(sizeof(struct hep_timeinfo)); if(heptime==NULL) { LM_ERR("no more pkg memory left\n"); return -1;

7 years, 1 month

git:master:991d73c2: Merge pull request #1279 from vitalikvoip/usrloc_fix

by GitHub

Module: kamailio Branch: master Commit: 991d73c27c7b119c13c09f46ac8efc93460dc91f URL: https://github.com/kamailio/kamailio/commit/991d73c27c7b119c13c09f46ac8efc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-25T12:05:34+02:00 Merge pull request #1279 from vitalikvoip/usrloc_fix Usrloc fix --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/991d73c27c7b119c13c09f46ac8efc9… Patch: https://github.com/kamailio/kamailio/commit/991d73c27c7b119c13c09f46ac8efc9… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index c7d48cde8f..1231d4fc8a 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -217,6 +217,8 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) int summary = 0; ucontact_t* c; void* th; + void* dah; + void* dh; void* ah; void* bh; void* ih; @@ -228,14 +230,27 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) if(brief.len==5 && (strncmp(brief.s, "brief", 5)==0)) summary = 1; + if (rpc->add(ctx, "{", &th) < 0) + { + rpc->fault(ctx, 500, "Internal error creating top rpc"); + return; + } + if (rpc->struct_add(th, "[", "Domains", &dah) < 0) + { + rpc->fault(ctx, 500, "Internal error creating inner struct"); + return; + } + for( dl=root ; dl ; dl=dl->next ) { dom = dl->d; - if (rpc->add(ctx, "{", &th) < 0) + + if (rpc->struct_add(dah, "{", "Domain", &dh) < 0) { - rpc->fault(ctx, 500, "Internal error creating top rpc"); + rpc->fault(ctx, 500, "Internal error creating inner struct"); return; } - if(rpc->struct_add(th, "Sd[", + + if(rpc->struct_add(dh, "Sd[", "Domain", &dl->name, "Size", (int)dom->size, "AoRs", &ah)<0) @@ -254,6 +269,7 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) if(rpc->struct_add(ah, "S", "AoR", &r->aor)<0) { + unlock_ulslot( dom, i); rpc->fault(ctx, 500, "Internal error creating aor struct"); return; } @@ -288,7 +304,7 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) } /* extra attributes node */ - if(rpc->struct_add(th, "{", "Stats", &sh)<0) + if(rpc->struct_add(dh, "{", "Stats", &sh)<0) { rpc->fault(ctx, 500, "Internal error creating stats struct"); return;

7 years, 1 month

git:master:247e9bf2: usrloc: fix format of the ul.dump json reply

by Vitaliy Aleksandrov

Module: kamailio Branch: master Commit: 247e9bf28ed900d980bf193708d2409cce3261d7 URL: https://github.com/kamailio/kamailio/commit/247e9bf28ed900d980bf193708d2409… Author: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Committer: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Date: 2017-10-23T19:15:44+03:00 usrloc: fix format of the ul.dump json reply - create "Domains" array instead of a single "Domain" object. --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/247e9bf28ed900d980bf193708d2409… Patch: https://github.com/kamailio/kamailio/commit/247e9bf28ed900d980bf193708d2409… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 36d2ed7d91..1231d4fc8a 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -217,6 +217,8 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) int summary = 0; ucontact_t* c; void* th; + void* dah; + void* dh; void* ah; void* bh; void* ih; @@ -228,14 +230,27 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) if(brief.len==5 && (strncmp(brief.s, "brief", 5)==0)) summary = 1; + if (rpc->add(ctx, "{", &th) < 0) + { + rpc->fault(ctx, 500, "Internal error creating top rpc"); + return; + } + if (rpc->struct_add(th, "[", "Domains", &dah) < 0) + { + rpc->fault(ctx, 500, "Internal error creating inner struct"); + return; + } + for( dl=root ; dl ; dl=dl->next ) { dom = dl->d; - if (rpc->add(ctx, "{", &th) < 0) + + if (rpc->struct_add(dah, "{", "Domain", &dh) < 0) { - rpc->fault(ctx, 500, "Internal error creating top rpc"); + rpc->fault(ctx, 500, "Internal error creating inner struct"); return; } - if(rpc->struct_add(th, "Sd[", + + if(rpc->struct_add(dh, "Sd[", "Domain", &dl->name, "Size", (int)dom->size, "AoRs", &ah)<0) @@ -289,7 +304,7 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) } /* extra attributes node */ - if(rpc->struct_add(th, "{", "Stats", &sh)<0) + if(rpc->struct_add(dh, "{", "Stats", &sh)<0) { rpc->fault(ctx, 500, "Internal error creating stats struct"); return;

7 years, 1 month

git:master:dfcba5fb: usrloc: fix usrloc slot lock in ul.dump rpc procedure

by Vitaliy Aleksandrov

Module: kamailio Branch: master Commit: dfcba5fbcc5046a12babd3c6e93555f89ffa9cbe URL: https://github.com/kamailio/kamailio/commit/dfcba5fbcc5046a12babd3c6e93555f… Author: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Committer: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Date: 2017-10-23T19:15:44+03:00 usrloc: fix usrloc slot lock in ul.dump rpc procedure - unlock usrloc slot when "ul.dump brief" fails during aor struct creation --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/dfcba5fbcc5046a12babd3c6e93555f… Patch: https://github.com/kamailio/kamailio/commit/dfcba5fbcc5046a12babd3c6e93555f… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index c7d48cde8f..36d2ed7d91 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -254,6 +254,7 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) if(rpc->struct_add(ah, "S", "AoR", &r->aor)<0) { + unlock_ulslot( dom, i); rpc->fault(ctx, 500, "Internal error creating aor struct"); return; }

7 years, 1 month

[kamailio/kamailio] Usrloc fix (#1279)

by vitalikvoip

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description The first commit unlocks a usrloc slot when "ul.dump brief" fails. Otherwise, it stays locked forever. The second one changes "ul.dump" output format and adds "Domains" array that includes all location domains. Without this fix "kamctl ul show" shows only the first domain. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1279 -- Commit Summary -- * usrloc: fix format of the ul.dump json reply * usrloc: fix usrloc slot lock in ul.dump rpc procedure -- File Changes -- M src/modules/usrloc/ul_rpc.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1279.patch https://github.com/kamailio/kamailio/pull/1279.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/1279

7 years, 1 month

git:master:d581c007: Merge pull request #1280 from sergey-safarov/alpine

by GitHub

Module: kamailio Branch: master Commit: d581c007ac29aea2c70fbeecdcebda701c37aa37 URL: https://github.com/kamailio/kamailio/commit/d581c007ac29aea2c70fbeecdcebda7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-25T12:03:27+02:00 Merge pull request #1280 from sergey-safarov/alpine pkg/kamailio/alpine_docker: Added support ssh git repo url --- Modified: pkg/kamailio/alpine_docker/build.sh --- Diff: https://github.com/kamailio/kamailio/commit/d581c007ac29aea2c70fbeecdcebda7… Patch: https://github.com/kamailio/kamailio/commit/d581c007ac29aea2c70fbeecdcebda7… --- diff --git a/pkg/kamailio/alpine_docker/build.sh b/pkg/kamailio/alpine_docker/build.sh index dee81c7467..75516c2c9f 100755 --- a/pkg/kamailio/alpine_docker/build.sh +++ b/pkg/kamailio/alpine_docker/build.sh @@ -23,7 +23,7 @@ apk add --no-cache abuild git gcc build-base bison db-dev flex expat-dev perl-de build_and_install(){ cd /usr/src/kamailio - REPO_OWNER=$(git remote get-url origin 2> /dev/null | sed -e 's:^.*github.com/::' -e 's:/.*\.git::') + REPO_OWNER=$(git remote get-url origin 2> /dev/null | sed -e 's|^.*github.com/||' -e 's|^git@github.com:||' -e 's|/.*\.git||') if [ ! -z "$REPO_OWNER" ]; then sed -i -e "s:github.com/kamailio:github.com/$REPO_OWNER:" /usr/src/kamailio/pkg/kamailio/alpine/APKBUILD fi

7 years, 1 month

← Newer
1
...
14
15
16
17
18
19
20
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2017