kamailio.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
List overview
Download
sr-dev
June 2024
----- 2024 -----
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
sr-dev@lists.kamailio.org
14 participants
223 discussions
Start a n
N
ew thread
git:5.8:65873cd2: pkg/kamailio/deb: fix tls_wolfssl packaging
by Victor Seva
Module: kamailio Branch: 5.8 Commit: 65873cd2cdd390ce10ec99888fb35b0095a90c65 URL:
https://github.com/kamailio/kamailio/commit/65873cd2cdd390ce10ec99888fb35b0…
Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-13T18:21:27+02:00 pkg/kamailio/deb: fix tls_wolfssl packaging * packages can't have '_' in name * distinguish grp module and deb module name '_' => '-' so tls_wolfssl => tls-wolfssl (cherry picked from commit 1d82805ef084d90e5ea14e4894f3e5076e29e2f3) --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules --- Diff:
https://github.com/kamailio/kamailio/commit/65873cd2cdd390ce10ec99888fb35b0…
Patch:
https://github.com/kamailio/kamailio/commit/65873cd2cdd390ce10ec99888fb35b0…
--- diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index b454421bff8..ee369ba7ccf 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -661,7 +661,7 @@ Description: TLS support for the Kamailio SIP server (authentication, transport) This package provides TLS support for encrypted and authenticated SIP connections as well as generic TLS support for many Kamailio modules. -Package: kamailio-wolftls-modules +Package: kamailio-tls-wolfssl-modules Architecture: any Multi-Arch: same Pre-Depends: diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index cbf680015ad..1cbace016b9 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -141,24 +141,27 @@ test_install_all-stamp: build $(MAKE) install quiet=verbose LIBDIR=$(LIBDIR) group_include="kstandard" touch test_install_all-stamp +# tls_wolfssl => tls-wolfssl +$(INSTALL_MODULES): module = $(subst _,-,$(subst install_,,$@)) +$(INSTALL_MODULES): grp = $(subst install_,,$@) $(INSTALL_MODULES): test_install_all-stamp $(MAKE) install-modules-all \ quiet=verbose \ LIBDIR=$(LIBDIR) \ - BASEDIR=$(D)-$(subst install_,,$@)-modules \ - cfg_prefix=$(D)-$(subst install_,,$@)-modules \ - doc-dir=share/doc/$(DEB_SOURCE)-$(subst install_,,$@)-modules \ - group_include="k$(subst install_,,$@)" + BASEDIR=$(D)-$(module)-modules \ + cfg_prefix=$(D)-$(module)-modules \ + doc-dir=share/doc/$(DEB_SOURCE)-$(module)-modules \ + group_include="k$(grp)" # Eliminate duplicate libs. for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(D)-$${module}-modules/usr/$(LIBDIR)/kamailio" && \ + test "$$d" != "$(D)-$(module)-modules/usr/$(LIBDIR)/kamailio" && \ for r in `find $$d -name 'lib*' | xargs`; do \ - echo "removing $(subst install_,,$@) lib `basename $$r` present also in $$d"; \ - rm -f $(D)-$(subst install_,,$@)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"`; \ + echo "removing $(module) lib `basename $$r` present also in $$d"; \ + rm -f $(D)-$(module)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"`; \ done ; \ done # clean empty dirs - find $(D)-$(subst install_,,$@)-modules -depth -empty -type d -exec rmdir {} \; + find $(D)-$(module)-modules -depth -empty -type d -exec rmdir {} \; $(INSTALL_EXTRA): test_install_all-stamp $(MAKE) install-modules-all \
5 months, 2 weeks
1
0
0
0
git:master:71e46581: pkg/kamailio/deb: refresh fix for tls_wolfssl
by Victor Seva
Module: kamailio Branch: master Commit: 71e465818ba3df8a08ee46a728a1b68b5ea647e9 URL:
https://github.com/kamailio/kamailio/commit/71e465818ba3df8a08ee46a728a1b68…
Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-13T17:05:03+02:00 pkg/kamailio/deb: refresh fix for tls_wolfssl --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/control Modified: pkg/kamailio/deb/xenial/rules --- Diff:
https://github.com/kamailio/kamailio/commit/71e465818ba3df8a08ee46a728a1b68…
Patch:
https://github.com/kamailio/kamailio/commit/71e465818ba3df8a08ee46a728a1b68…
5 months, 2 weeks
1
0
0
0
git:master:1d82805e: pkg/kamailio/deb: fix tls_wolfssl packaging
by Victor Seva
Module: kamailio Branch: master Commit: 1d82805ef084d90e5ea14e4894f3e5076e29e2f3 URL:
https://github.com/kamailio/kamailio/commit/1d82805ef084d90e5ea14e4894f3e50…
Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-13T17:04:39+02:00 pkg/kamailio/deb: fix tls_wolfssl packaging * packages can't have '_' in name * distinguish grp module and deb module name '_' => '-' so tls_wolfssl => tls-wolfssl --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules --- Diff:
https://github.com/kamailio/kamailio/commit/1d82805ef084d90e5ea14e4894f3e50…
Patch:
https://github.com/kamailio/kamailio/commit/1d82805ef084d90e5ea14e4894f3e50…
--- diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index b454421bff8..ee369ba7ccf 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -661,7 +661,7 @@ Description: TLS support for the Kamailio SIP server (authentication, transport) This package provides TLS support for encrypted and authenticated SIP connections as well as generic TLS support for many Kamailio modules. -Package: kamailio-wolftls-modules +Package: kamailio-tls-wolfssl-modules Architecture: any Multi-Arch: same Pre-Depends: diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index cbf680015ad..1cbace016b9 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -141,24 +141,27 @@ test_install_all-stamp: build $(MAKE) install quiet=verbose LIBDIR=$(LIBDIR) group_include="kstandard" touch test_install_all-stamp +# tls_wolfssl => tls-wolfssl +$(INSTALL_MODULES): module = $(subst _,-,$(subst install_,,$@)) +$(INSTALL_MODULES): grp = $(subst install_,,$@) $(INSTALL_MODULES): test_install_all-stamp $(MAKE) install-modules-all \ quiet=verbose \ LIBDIR=$(LIBDIR) \ - BASEDIR=$(D)-$(subst install_,,$@)-modules \ - cfg_prefix=$(D)-$(subst install_,,$@)-modules \ - doc-dir=share/doc/$(DEB_SOURCE)-$(subst install_,,$@)-modules \ - group_include="k$(subst install_,,$@)" + BASEDIR=$(D)-$(module)-modules \ + cfg_prefix=$(D)-$(module)-modules \ + doc-dir=share/doc/$(DEB_SOURCE)-$(module)-modules \ + group_include="k$(grp)" # Eliminate duplicate libs. for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(D)-$${module}-modules/usr/$(LIBDIR)/kamailio" && \ + test "$$d" != "$(D)-$(module)-modules/usr/$(LIBDIR)/kamailio" && \ for r in `find $$d -name 'lib*' | xargs`; do \ - echo "removing $(subst install_,,$@) lib `basename $$r` present also in $$d"; \ - rm -f $(D)-$(subst install_,,$@)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"`; \ + echo "removing $(module) lib `basename $$r` present also in $$d"; \ + rm -f $(D)-$(module)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"`; \ done ; \ done # clean empty dirs - find $(D)-$(subst install_,,$@)-modules -depth -empty -type d -exec rmdir {} \; + find $(D)-$(module)-modules -depth -empty -type d -exec rmdir {} \; $(INSTALL_EXTRA): test_install_all-stamp $(MAKE) install-modules-all \
5 months, 2 weeks
1
0
0
0
git:master:128604b6: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev
Module: kamailio Branch: master Commit: 128604b6bda0c193fab4d0f2dd5bd6e2927bfdbd URL:
https://github.com/kamailio/kamailio/commit/128604b6bda0c193fab4d0f2dd5bd6e…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-13T13:31:10+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff:
https://github.com/kamailio/kamailio/commit/128604b6bda0c193fab4d0f2dd5bd6e…
Patch:
https://github.com/kamailio/kamailio/commit/128604b6bda0c193fab4d0f2dd5bd6e…
--- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index fbac75c662d..41f9d7bb812 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1638,8 +1638,9 @@ onreply_route { 4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) - Sets the overload control rate and time internval limit for the - destination (setid, uri). + Sets the overload control rate, time internval limit and sequence + number for the destination record (setid, uri) following RFC7339 + specifications. Description of parameters: * setid - the set (group) id. The parameter can be an integer or a @@ -1658,7 +1659,7 @@ onreply_route { Example 1.60. ds_oc_set_attrs() usage ... - ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "1000", "1"); + ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "180000", "1"); ... 5. RPC Commands
5 months, 2 weeks
1
0
0
0
git:master:0666d34f: dispacther: docs - remark about RFC7339 for overload control values
by Daniel-Constantin Mierla
Module: kamailio Branch: master Commit: 0666d34f8816479724b4bdf4621147ccba156c66 URL:
https://github.com/kamailio/kamailio/commit/0666d34f8816479724b4bdf4621147c…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T13:24:04+02:00 dispacther: docs - remark about RFC7339 for overload control values --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff:
https://github.com/kamailio/kamailio/commit/0666d34f8816479724b4bdf4621147c…
Patch:
https://github.com/kamailio/kamailio/commit/0666d34f8816479724b4bdf4621147c…
--- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 70a30ed7f7e..e50ea26f518 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2019,8 +2019,8 @@ onreply_route { <function moreinfo="none">ds_oc_set_attrs(setid, uri, rval, tval, sval)</function> </title> <para> - Sets the overload control rate and time internval limit - for the destination (setid, uri). + Sets the overload control rate, time internval limit and sequence number + for the destination record (setid, uri) following RFC7339 specifications. </para> <para>Description of parameters:</para> <itemizedlist> @@ -2055,7 +2055,7 @@ onreply_route { <title><function>ds_oc_set_attrs()</function> usage</title> <programlisting format="linespecific"> ... - ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "1000", "1"); + ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "180000", "1"); ... </programlisting> </example>
5 months, 2 weeks
1
0
0
0
git:master:b3875476: dispatcher: use milliseconds for time validity interval
by Daniel-Constantin Mierla
Module: kamailio Branch: master Commit: b3875476e02bf2590e857f73367efa4cedfbd328 URL:
https://github.com/kamailio/kamailio/commit/b3875476e02bf2590e857f73367efa4…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T13:09:08+02:00 dispatcher: use milliseconds for time validity interval --- Modified: src/modules/dispatcher/dispatch.c --- Diff:
https://github.com/kamailio/kamailio/commit/b3875476e02bf2590e857f73367efa4…
Patch:
https://github.com/kamailio/kamailio/commit/b3875476e02bf2590e857f73367efa4…
--- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 678352bf62d..ecd0f3a0c9d 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -473,8 +473,8 @@ int ds_oc_set_attrs( timerclear(&tdiff); /* interval set to itval or to default 500 milliseconds */ - tdiff.tv_sec = ((itval > 0) ? itval : 500000) / 1000000; - tdiff.tv_usec = ((itval > 0) ? itval : 500000) % 1000000; + tdiff.tv_sec = (((itval > 0) ? itval : 500) * 1000) / 1000000; + tdiff.tv_usec = (((itval > 0) ? itval : 500) * 1000) % 1000000; for(i = 0; i < idx->nr; i++) { if(idx->dlist[i].uri.len == duri->len
5 months, 2 weeks
1
0
0
0
git:master:736408b3: dispatcher: keep internal oc rate as the received value
by Daniel-Constantin Mierla
Module: kamailio Branch: master Commit: 736408b3e6e05cffd3978689b10549dc236ccb0d URL:
https://github.com/kamailio/kamailio/commit/736408b3e6e05cffd3978689b10549d…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T12:52:39+02:00 dispatcher: keep internal oc rate as the received value --- Modified: src/modules/dispatcher/dispatch.c --- Diff:
https://github.com/kamailio/kamailio/commit/736408b3e6e05cffd3978689b10549d…
Patch:
https://github.com/kamailio/kamailio/commit/736408b3e6e05cffd3978689b10549d…
--- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index bab1a5deb31..678352bf62d 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -405,7 +405,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) str2int(&pit->body, &dest->attrs.ocmax); } else if(pit->name.len == 6 && strncasecmp(pit->name.s, "ocrate", 6) == 0) { - str2int(&pit->body, &dest->attrs.ocmin); + str2int(&pit->body, &dest->attrs.ocrate); } } if(dest->attrs.ocmax < 0 || dest->attrs.ocmax > 100) { @@ -435,12 +435,12 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) void ds_oc_prepare(ds_dest_t *dp) { int i; - for(i = 0; i < 100 - dp->attrs.ocrate; i++) { - dp->ocdist[i] = 1; - } - for(i = 100 - dp->attrs.ocrate; i < 100; i++) { + for(i = 0; i < dp->attrs.ocrate; i++) { dp->ocdist[i] = 0; } + for(i = dp->attrs.ocrate; i < 100; i++) { + dp->ocdist[i] = 1; + } shuffle_uint100array(dp->ocdist); } @@ -473,7 +473,8 @@ int ds_oc_set_attrs( timerclear(&tdiff); /* interval set to itval or to default 500 milliseconds */ - tdiff.tv_usec = (itval > 0) ? itval : 500000; + tdiff.tv_sec = ((itval > 0) ? itval : 500000) / 1000000; + tdiff.tv_usec = ((itval > 0) ? itval : 500000) % 1000000; for(i = 0; i < idx->nr; i++) { if(idx->dlist[i].uri.len == duri->len @@ -482,7 +483,7 @@ int ds_oc_set_attrs( LM_DBG("skipping entry %d due to seq condition\n", i); continue; } - idx->dlist[i].attrs.ocrate = 100 - irval; + idx->dlist[i].attrs.ocrate = irval; if(idx->dlist[i].attrs.ocrate < idx->dlist[i].attrs.ocmin) { idx->dlist[i].attrs.ocrate = idx->dlist[i].attrs.ocmin; } @@ -504,6 +505,7 @@ int ds_oc_set_attrs( */ static inline int ds_oc_skip(ds_set_t *dsg, int alg, int n) { + int ret; struct timeval tnow; if(alg != DS_ALG_OVERLOAD) { @@ -514,16 +516,19 @@ static inline int ds_oc_skip(ds_set_t *dsg, int alg, int n) if(timercmp(&dsg->dlist[n].octime, &tnow, <)) { /* over the time interval validity - use it */ + LM_DBG("time validity not matching\n"); return 0; } if(dsg->dlist[n].ocdist[dsg->dlist[n].ocidx] == 1) { /* use it */ - return 0; + ret = 0; + } else { + /* skip it */ + ret = 1; } dsg->dlist[n].ocidx = (dsg->dlist[n].ocidx + 1) % 100; - /* skip it */ - return 1; + return ret; } /**
5 months, 2 weeks
1
0
0
0
git:master:c3ce318e: dispatcher: print oc details in the record group not in attrs
by Daniel-Constantin Mierla
Module: kamailio Branch: master Commit: c3ce318e01bf0eae70daa109e680a75f3ea71546 URL:
https://github.com/kamailio/kamailio/commit/c3ce318e01bf0eae70daa109e680a75…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T11:51:46+02:00 dispatcher: print oc details in the record group not in attrs --- Modified: src/modules/dispatcher/dispatcher.c --- Diff:
https://github.com/kamailio/kamailio/commit/c3ce318e01bf0eae70daa109e680a75…
Patch:
https://github.com/kamailio/kamailio/commit/c3ce318e01bf0eae70daa109e680a75…
--- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 1e6beef600d..3fd941c21c4 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1869,12 +1869,16 @@ int ds_rpc_print_set( ipbuf[0] = '\0'; ip_addr2sbufz( &node->dlist[j].ip_address, ipbuf, IP_ADDR_MAX_STRZ_SIZE); - if(rpc->struct_add(vh, "Ssddjj", "HOST", &node->dlist[j].host, + if(rpc->struct_add(vh, "Ssddjjujj", "HOST", &node->dlist[j].host, "IPADDR", ipbuf, "PORT", (int)node->dlist[j].port, "PROTOID", (int)node->dlist[j].proto, "DNSTIME_SEC", (unsigned long)node->dlist[j].dnstime.tv_sec, "DNSTIME_USEC", - (unsigned long)node->dlist[j].dnstime.tv_usec) + (unsigned long)node->dlist[j].dnstime.tv_usec, "OCRATE", + node->dlist[j].attrs.ocrate, "OCTIME_SEC", + (unsigned long)node->dlist[j].octime.tv_sec, + "OCTIME_USEC", + (unsigned long)node->dlist[j].octime.tv_usec) < 0) { rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; @@ -1886,7 +1890,7 @@ int ds_rpc_print_set( rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; } - if(rpc->struct_add(wh, "SSdddSSSujj", "BODY", + if(rpc->struct_add(wh, "SSdddSSS", "BODY", &(node->dlist[j].attrs.body), "DUID", (node->dlist[j].attrs.duid.s) ? &(node->dlist[j].attrs.duid) @@ -1904,11 +1908,7 @@ int ds_rpc_print_set( "OBPROXY", (node->dlist[j].attrs.obproxy.s) ? &(node->dlist[j].attrs.obproxy) - : &data, - "OCRATE", node->dlist[j].attrs.ocrate, "OCTIME_SEC", - (unsigned long)node->dlist[j].octime.tv_sec, - "OCTIME_USEC", - (unsigned long)node->dlist[j].octime.tv_usec) + : &data) < 0) { rpc->fault(ctx, 500, "Internal error creating attrs struct"); return -1;
5 months, 2 weeks
1
0
0
0
git:5.7:f8fa74e7: core: tcp - change log levels for failing to set source for tcp connections
by Daniel-Constantin Mierla
Module: kamailio Branch: 5.7 Commit: f8fa74e7b2901ecae8bbb851250d8b28452b18da URL:
https://github.com/kamailio/kamailio/commit/f8fa74e7b2901ecae8bbb851250d8b2…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T10:53:36+02:00 core: tcp - change log levels for failing to set source for tcp connections - it is not possible always and it can fill the logs (cherry picked from commit 15403a543d83e337ee578ad37dc1d84316e4cf16) (cherry picked from commit 8a027b99cf8dc4f7e889aa7644f1f7699c7cb08e) --- Modified: src/core/tcp_main.c --- Diff:
https://github.com/kamailio/kamailio/commit/f8fa74e7b2901ecae8bbb851250d8b2…
Patch:
https://github.com/kamailio/kamailio/commit/f8fa74e7b2901ecae8bbb851250d8b2…
--- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 955eb4b6e19..593f1a3be57 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1284,7 +1284,7 @@ inline static int find_listening_sock_info( if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&optval, sizeof(optval)) == -1) { - LM_ERR("setsockopt SO_REUSEADDR %s\n", strerror(errno)); + LM_NOTICE("setsockopt SO_REUSEADDR [%s]\n", strerror(errno)); /* continue, not critical */ } #endif @@ -1293,19 +1293,19 @@ inline static int find_listening_sock_info( if(setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (void *)&optval, sizeof(optval)) == -1) { - LM_ERR("setsockopt SO_REUSEPORT %s\n", strerror(errno)); + LM_NOTICE("setsockopt SO_REUSEPORT [%s]\n", strerror(errno)); /* continue, not critical */ } #endif if(unlikely(bind(s, &si->su.s, sockaddru_len(si->su)) != 0)) { - LM_WARN("binding to source address %s failed: %s [%d]\n", + LM_DBG("binding to source address %s failed: [%s] [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno); return -1; } } } else { if(unlikely(bind(s, &(*from)->s, sockaddru_len(**from)) != 0)) { - LM_WARN("binding to source address %s failed: %s [%d]\n", + LM_DBG("binding to source address %s failed: [%s] [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno); return -1; }
5 months, 2 weeks
1
0
0
0
git:5.8:8a027b99: core: tcp - change log levels for failing to set source for tcp connections
by Daniel-Constantin Mierla
Module: kamailio Branch: 5.8 Commit: 8a027b99cf8dc4f7e889aa7644f1f7699c7cb08e URL:
https://github.com/kamailio/kamailio/commit/8a027b99cf8dc4f7e889aa7644f1f76…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T10:53:09+02:00 core: tcp - change log levels for failing to set source for tcp connections - it is not possible always and it can fill the logs (cherry picked from commit 15403a543d83e337ee578ad37dc1d84316e4cf16) --- Modified: src/core/tcp_main.c --- Diff:
https://github.com/kamailio/kamailio/commit/8a027b99cf8dc4f7e889aa7644f1f76…
Patch:
https://github.com/kamailio/kamailio/commit/8a027b99cf8dc4f7e889aa7644f1f76…
--- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 2456459cfa2..d5a46030cf4 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1288,7 +1288,7 @@ inline static int find_listening_sock_info( if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&optval, sizeof(optval)) == -1) { - LM_ERR("setsockopt SO_REUSEADDR %s\n", strerror(errno)); + LM_NOTICE("setsockopt SO_REUSEADDR [%s]\n", strerror(errno)); /* continue, not critical */ } #endif @@ -1297,19 +1297,19 @@ inline static int find_listening_sock_info( if(setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (void *)&optval, sizeof(optval)) == -1) { - LM_ERR("setsockopt SO_REUSEPORT %s\n", strerror(errno)); + LM_NOTICE("setsockopt SO_REUSEPORT [%s]\n", strerror(errno)); /* continue, not critical */ } #endif if(unlikely(bind(s, &si->su.s, sockaddru_len(si->su)) != 0)) { - LM_WARN("binding to source address %s failed: %s [%d]\n", + LM_DBG("binding to source address %s failed: [%s] [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno); return -1; } } } else { if(unlikely(bind(s, &(*from)->s, sockaddru_len(**from)) != 0)) { - LM_WARN("binding to source address %s failed: %s [%d]\n", + LM_DBG("binding to source address %s failed: [%s] [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno); return -1; }
5 months, 2 weeks
1
0
0
0
← Newer
1
...
11
12
13
14
15
16
17
...
23
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
Results per page:
10
25
50
100
200