sr-dev October 2018

sr-dev@lists.kamailio.org

23 participants
274 discussions

[kamailio/kamailio] sdpops: fetch and manipulate SDP o= -line sess-version attribute (#1659)

by Mikko Lehto

#### 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 #### Type Of Change - [X] New feature (non-breaking change which adds new functionality) #### Checklist: - [X] Tested changes locally #### Description Add PV $sdp(sess_version) for reading and writing SDP o= -line attribute sess-version. Special integer value -1 increments current value. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1659 -- Commit Summary -- * core: parse SDP origin line sess-version field * sdpops: fetch and manipulate origin line sess-version through pseudo-variable -- File Changes -- M src/core/parser/sdp/sdp.c (8) M src/core/parser/sdp/sdp.h (1) M src/core/parser/sdp/sdp_helpr_funcs.c (68) M src/core/parser/sdp/sdp_helpr_funcs.h (1) M src/modules/sdpops/sdpops_mod.c (168) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1659.patch https://github.com/kamailio/kamailio/pull/1659.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/1659

6 years, 2 months

git:master:23a76ee4: Merge pull request #1659 from mslehto/sdpops_o_line

by Mikko Lehto

Module: kamailio Branch: master Commit: 23a76ee461afbd29232c388f0890abe7848dba10 URL: https://github.com/kamailio/kamailio/commit/23a76ee461afbd29232c388f0890abe… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-10-02T12:50:54+03:00 Merge pull request #1659 from mslehto/sdpops_o_line --- Modified: src/core/parser/sdp/sdp.c Modified: src/core/parser/sdp/sdp.h Modified: src/core/parser/sdp/sdp_helpr_funcs.c Modified: src/core/parser/sdp/sdp_helpr_funcs.h Modified: src/modules/sdpops/doc/sdpops_admin.xml Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/23a76ee461afbd29232c388f0890abe… Patch: https://github.com/kamailio/kamailio/commit/23a76ee461afbd29232c388f0890abe…

6 years, 2 months

git:master:6a86d0bd: sdpops: add PV documentation

by Mikko Lehto

Module: kamailio Branch: master Commit: 6a86d0bd1371dd7268968101c1c437b2754dc8ac URL: https://github.com/kamailio/kamailio/commit/6a86d0bd1371dd7268968101c1c437b… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-10-02T12:00:58+03:00 sdpops: add PV documentation --- Modified: src/modules/sdpops/doc/sdpops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6a86d0bd1371dd7268968101c1c437b… Patch: https://github.com/kamailio/kamailio/commit/6a86d0bd1371dd7268968101c1c437b… --- diff --git a/src/modules/sdpops/doc/sdpops_admin.xml b/src/modules/sdpops/doc/sdpops_admin.xml index f51dfe0a3c..ddcafd9b28 100644 --- a/src/modules/sdpops/doc/sdpops_admin.xml +++ b/src/modules/sdpops/doc/sdpops_admin.xml @@ -574,5 +574,25 @@ if(sdp_get_line_startswith("$avp(mline)", "m=")) { </example> </section> </section> + + <section> + <title>Exported Variables</title> + <section> + <title><varname>$sdp( )</varname></title> + <para>Access to SDP attributes</para> + <itemizedlist> + <listitem><para> + <emphasis>$sdp(body)</emphasis> - full SDP body (read only) + </para></listitem> + <listitem><para> + <emphasis>$sdp(sess_version)</emphasis> - sess-version -attribute from SDP o= -line. When set to special value -1, current value is incremented. (read + write) + </para></listitem> + </itemizedlist> + <para> + Exported pseudo-variables are also documented at &kamwikilink; + </para> + </section> + </section> + </chapter>

6 years, 2 months

git:master:e1a5b5ce: core: parse SDP origin line sess-version field

by Mikko Lehto

Module: kamailio Branch: master Commit: e1a5b5cefc18f194256ddd5790e11cde7447387e URL: https://github.com/kamailio/kamailio/commit/e1a5b5cefc18f194256ddd5790e11cd… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-09-28T15:42:15+03:00 core: parse SDP origin line sess-version field --- Modified: src/core/parser/sdp/sdp.c Modified: src/core/parser/sdp/sdp.h Modified: src/core/parser/sdp/sdp_helpr_funcs.c Modified: src/core/parser/sdp/sdp_helpr_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/e1a5b5cefc18f194256ddd5790e11cd… Patch: https://github.com/kamailio/kamailio/commit/e1a5b5cefc18f194256ddd5790e11cd… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index f49fc7e0c5..f922f1b0fd 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -410,6 +410,14 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ session = add_sdp_session(_sdp, session_num, cnt_disp); if (session == NULL) return -1; + /* Get sess-version */ + tmpstr1.s = o1p; + tmpstr1.len = eat_line(o1p,m1p-o1p) - o1p; + if ( extract_sess_version(&tmpstr1, &session->o_sess_version) == -1 ) { + LM_ERR("can't extract origin sess-version from the message\n"); + return -1; + } + /* Get origin IP */ tmpstr1.s = o1p; tmpstr1.len = bodylimit - tmpstr1.s; /* limit is session limit text */ diff --git a/src/core/parser/sdp/sdp.h b/src/core/parser/sdp/sdp.h index ab32d93d86..84ebcfc8a2 100644 --- a/src/core/parser/sdp/sdp.h +++ b/src/core/parser/sdp/sdp.h @@ -102,6 +102,7 @@ typedef struct sdp_session_cell { int pf; /**< connection address family: AF_INET/AF_INET6 */ str ip_addr; /**< connection address */ /* o=<username> <session id> <version> <network type> <address type> <address> */ + str o_sess_version; /** < origin session version number */ int o_pf; /**< origin address family: AF_INET/AF_INET6 */ str o_ip_addr; /**< origin address */ /* b=<bwtype>:<bandwidth> */ diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index e0680342f6..2562b33234 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -590,6 +590,74 @@ int extract_media_attr(str *body, str *mediamedia, str *mediaport, str *mediatra return 0; } +int extract_sess_version(str* oline, str* sess_version) { + + char* cp0 = NULL; + char* cp = NULL; + int len = 0; + char ws = ' '; + int i=0; + + /* + "o=jdoe 2890844526 2890842807 IN IP4 10.47.16.5" CR LF + "o=W 1 2 IN IP4 0.0.0.0" CR LF -> 24 + "o=W 1 2 IN IP6 ::1" CR LF -> 20 + "o=W 1 2 X Y Z" CR LF -> 15 + */ + if ( oline->s == NULL || oline->len < 15 ) + { + LM_ERR("invalid o -line\n"); + return -1; + } + + if ( sess_version == NULL ) + { + LM_ERR("invalid result pointer\n"); + return -1; + } + + LM_DBG("oline(%d): >%.*s<\n", oline->len, oline->len, oline->s); + + // jump over o= + cp = oline->s + 2; + len = oline->len - 2; + + // find whitespace 3 times + do + { + cp0=cp; + //LM_DBG("loop %d: >%.*s<\n", len, len, cp0); + + cp = (char*)ser_memmem(cp0, &ws, len, 1); + if ( cp == NULL) { break; } + + //LM_DBG("cp0: %p cp: %p (%ld)\n", cp0, cp, cp-cp0); + len-=cp-cp0; + + // step over whitespace + if ( len > 0 ) + { + cp++; + len--; + } + + i++; + } while ( len < oline->len && i < 3 ); + + len = cp-cp0-1; + LM_DBG("end %d: >%.*s<\n", len, len, cp0); + + sess_version->s = cp0; + sess_version->len = len; + + if (!isdigit(*cp0)) + { + LM_WARN("not digit >%.*s<\n", len, cp0); + } + + return 1; +} + /* * Auxiliary for some functions. diff --git a/src/core/parser/sdp/sdp_helpr_funcs.h b/src/core/parser/sdp/sdp_helpr_funcs.h index cc46375ad7..406f57b165 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.h +++ b/src/core/parser/sdp/sdp_helpr_funcs.h @@ -52,6 +52,7 @@ int extract_mediaip(str *body, str *mediaip, int *pf, char *line); int extract_media_attr(str *body, str *mediamedia, str *mediaport, str *mediatransport, str *mediapayload, int *is_rtp); int extract_bwidth(str *body, str *bwtype, str *bwwitdth); int extract_candidate(str *body, sdp_stream_cell_t *stream); +int extract_sess_version(str* oline, str* sess_version); /* RFC3605 attributes */ int extract_rtcp(str *body, str *rtcp);

6 years, 2 months

git:master:fea91f05: sdpops: fetch and manipulate origin line sess-version through pseudo-variable

by Mikko Lehto

Module: kamailio Branch: master Commit: fea91f05261555994cbeeb1acfaf2232324a39bf URL: https://github.com/kamailio/kamailio/commit/fea91f05261555994cbeeb1acfaf223… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-09-28T15:42:15+03:00 sdpops: fetch and manipulate origin line sess-version through pseudo-variable --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fea91f05261555994cbeeb1acfaf223… Patch: https://github.com/kamailio/kamailio/commit/fea91f05261555994cbeeb1acfaf223…

6 years, 2 months

[kamailio/kamailio] [5.1] pkg/docker: updated submodule (#1663)

by sergey-safarov

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1663 -- Commit Summary -- * pkg/docker: updated submodule -- File Changes -- M pkg/docker (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1663.patch https://github.com/kamailio/kamailio/pull/1663.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/1663

6 years, 2 months

git:5.1:ff91717c: Merge pull request #1663 from sergey-safarov/spec2

by GitHub

Module: kamailio Branch: 5.1 Commit: ff91717c04bf616c53e673644ec61e2b9a9f1f8a URL: https://github.com/kamailio/kamailio/commit/ff91717c04bf616c53e673644ec61e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-10-02T11:26:41+02:00 Merge pull request #1663 from sergey-safarov/spec2 [5.1] pkg/docker: updated submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/ff91717c04bf616c53e673644ec61e2… Patch: https://github.com/kamailio/kamailio/commit/ff91717c04bf616c53e673644ec61e2… --- diff --git a/pkg/docker b/pkg/docker index 5e6a821c3a..3c8a156abe 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 5e6a821c3ab9b4c07729daa49ce2c6eb17ddbc15 +Subproject commit 3c8a156abef2a034d9a21df5bf73f4b5cc4d3e05

6 years, 2 months

git:5.1:c071e6b0: pkg/docker: updated submodule

by Sergey Safarov

Module: kamailio Branch: 5.1 Commit: c071e6b0d1f5d4c3679e32207cd0fba372a22fbf URL: https://github.com/kamailio/kamailio/commit/c071e6b0d1f5d4c3679e32207cd0fba… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-10-01T19:03:39Z pkg/docker: updated submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/c071e6b0d1f5d4c3679e32207cd0fba… Patch: https://github.com/kamailio/kamailio/commit/c071e6b0d1f5d4c3679e32207cd0fba… --- diff --git a/pkg/docker b/pkg/docker index 5e6a821c3a..3c8a156abe 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 5e6a821c3ab9b4c07729daa49ce2c6eb17ddbc15 +Subproject commit 3c8a156abef2a034d9a21df5bf73f4b5cc4d3e05

6 years, 2 months

[kamailio/kamailio] pkg/docker: updated submodule (#1662)

by sergey-safarov

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1662 -- Commit Summary -- * pkg/docker: updated submodule -- File Changes -- M pkg/docker (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1662.patch https://github.com/kamailio/kamailio/pull/1662.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/1662

6 years, 2 months

git:master:649f9eb3: Merge pull request #1662 from sergey-safarov/spec

by GitHub

Module: kamailio Branch: master Commit: 649f9eb315198f169e74f20605745a89ad80f09b URL: https://github.com/kamailio/kamailio/commit/649f9eb315198f169e74f20605745a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-10-02T11:26:32+02:00 Merge pull request #1662 from sergey-safarov/spec pkg/docker: updated submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/649f9eb315198f169e74f20605745a8… Patch: https://github.com/kamailio/kamailio/commit/649f9eb315198f169e74f20605745a8… --- diff --git a/pkg/docker b/pkg/docker index 5e6a821c3a..3c8a156abe 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 5e6a821c3ab9b4c07729daa49ce2c6eb17ddbc15 +Subproject commit 3c8a156abef2a034d9a21df5bf73f4b5cc4d3e05

6 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2018