sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:kamailio_3.0: core: socket_str enclose IPv6 addresses in betwen [ ]

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: fc67150b32deac0da3246763f4c9e32747f546d8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc67150… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 3 10:14:26 2010 +0200 core: socket_str enclose IPv6 addresses in betwen [ ] - string representation of socket string takes in consideration IPv6 addresses (cherry picked from commit 426c6b7e2103d38aca47ca9728d22355bd44b7e9) Conflicts: pkg/kamailio/debian-lenny --- pkg/kamailio/debian-lenny | 1 - socket_info.c | 9 +++++++++ socket_info.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/kamailio/debian-lenny b/pkg/kamailio/debian-lenny deleted file mode 120000 index b2f7fd3..0000000 --- a/pkg/kamailio/debian-lenny +++ /dev/null @@ -1 +0,0 @@ -debian \ No newline at end of file diff --git a/socket_info.c b/socket_info.c index 6627d70..a1f8bb0 100644 --- a/socket_info.c +++ b/socket_info.c @@ -321,6 +321,9 @@ int socket2str(char* s, int* len, struct socket_info* si) proto.len = strlen(proto.s); l = proto.len + si->address_str.len + si->port_no_str.len + 2; + + if(si->address.af==AF_INET6) + l += 2; if (*len < l) { ERR("socket2str: Destionation buffer too short\n"); @@ -331,8 +334,14 @@ int socket2str(char* s, int* len, struct socket_info* si) memcpy(s, proto.s, proto.len); s += proto.len; *s = ':'; s++; + if(si->address.af==AF_INET6) { + *s = '['; s++; + } memcpy(s, si->address_str.s, si->address_str.len); s += si->address_str.len; + if(si->address.af==AF_INET6) { + *s = ']'; s++; + } *s = ':'; s++; memcpy(s, si->port_no_str.s, si->port_no_str.len); s += si->port_no_str.len; diff --git a/socket_info.h b/socket_info.h index 6da9437..7923e65 100644 --- a/socket_info.h +++ b/socket_info.h @@ -47,7 +47,7 @@ * the text description of any socket, not counting the terminating zero added * by socket2str */ #define MAX_SOCKET_STR (sizeof("unknown") - 1 + IP_ADDR_MAX_STR_SIZE + \ - INT2STR_MAX_LEN + 2) + INT2STR_MAX_LEN + 2 + 2) int socket2str(char* s, int* len, struct socket_info* si);

14 years, 5 months

git untracked files

by Ovidiu Sas

Hello all, After compiling sip-router, if I run git status, the following files are listed as untracked: $ git status # On branch master # Untracked files: # (use "git add <file>..." to include in what will be committed) # # modules/auth/auth.7 # modules/privacy/README # modules_s/acc_db/acc_db.7 # modules_s/acc_syslog/acc_syslog.7 # modules_s/auth_db/auth_db.7 # modules_s/avp/avp.7 # modules_s/avp_db/avp_db.7 nothing added to commit but untracked files present (use "git add" to track) The above files should be either added to the git repo or the ignore list should be updated. Regards, Ovidiu Sas

14 years, 5 months

git:master: doc: rpc_list regenerated

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 814ab6039f2e9fcbf3b91c21f63b097a087b1ca7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=814ab60… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Sep 2 18:21:05 2010 +0200 doc: rpc_list regenerated --- doc/rpc_list/docbook/rpc_core.xml | 36 ++++++- doc/rpc_list/docbook/rpc_counters.xml | 70 ++++++++++++ doc/rpc_list/docbook/rpc_dialog.xml | 77 +++++++++++++ doc/rpc_list/docbook/rpc_lcr.xml | 8 +- doc/rpc_list/docbook/rpc_list.xml | 12 ++- doc/rpc_list/docbook/rpc_malloc_test.xml | 117 ++++++++++++++++++++ doc/rpc_list/docbook/rpc_ratelimit_k.xml | 94 ++++++++++++++++ .../{rpc_ratelimit.xml => rpc_ratelimit_s.xml} | 4 +- doc/rpc_list/docbook/rpc_tls.xml | 16 +++ doc/rpc_list/rpc_core.txt | 80 ++++++++------ doc/rpc_list/rpc_counters.txt | 30 +++++ doc/rpc_list/rpc_dialog.txt | 32 ++++++ doc/rpc_list/rpc_lcr.txt | 8 +- doc/rpc_list/rpc_malloc_test.txt | 61 ++++++++++ doc/rpc_list/rpc_ratelimit_k.txt | 39 +++++++ .../{rpc_ratelimit.txt => rpc_ratelimit_s.txt} | 4 +- doc/rpc_list/rpc_tls.txt | 6 + 17 files changed, 644 insertions(+), 50 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=814…

14 years, 5 months

git:master: doc: rpc_list: updated list of files with rpc defs

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: d258cf4eb430e9b6552d287744a2d9ecc824e045 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d258cf4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Sep 2 18:07:40 2010 +0200 doc: rpc_list: updated list of files with rpc defs Removed modules_s/sl, added counters, malloc_test, sl (merged version), dialog and ratelimit(k) to the default list. --- doc/rpc_list/Makefile | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/rpc_list/Makefile b/doc/rpc_list/Makefile index 06b4a32..589a81c 100644 --- a/doc/rpc_list/Makefile +++ b/doc/rpc_list/Makefile @@ -20,14 +20,19 @@ docbook_output_dir=docbook files_list= \ $(COREPATH)/core_cmd.c:core \ $(COREPATH)/modules/cfg_rpc/cfg_rpc.c:cfg_rpc \ + $(COREPATH)/modules/counters/counters.c:counters \ $(COREPATH)/modules/ctl/ctl.c:ctl \ $(COREPATH)/modules/db_flatstore/flat_rpc.c:db_flatstore \ $(COREPATH)/modules/debugger/debugger_api.c:debugger \ $(COREPATH)/modules/lcr/lcr_rpc.c:lcr \ + $(COREPATH)/modules/malloc_test/malloc_test.c:malloc_test \ $(COREPATH)/modules/mi_rpc/mi_rpc_mod.c:mi_rpc \ + $(COREPATH)/modules/sl/sl_stats.c:sl \ $(COREPATH)/modules/tls/tls_rpc.c:tls \ $(COREPATH)/modules/tm/tm.c:tm \ + $(COREPATH)/modules_k/dialog/dialog.c:dialog \ $(COREPATH)/modules_k/htable/htable.c:htable \ + $(COREPATH)/modules_k/ratelimit/ratelimit.c:ratelimit_k \ $(COREPATH)/modules_k/uac/uac_reg.c:uac \ $(COREPATH)/modules_k/usrloc/ul_rpc.c:usrloc_k \ $(COREPATH)/modules_s/cpl-c/cpl_rpc.c:cpl-c \ @@ -38,8 +43,7 @@ files_list= \ $(COREPATH)/modules_s/pike/rpc.c:pike \ $(COREPATH)/modules_s/prefix_route/pr_rpc.c:prefix_route \ $(COREPATH)/modules_s/presence_b2b/rpc.c:presence_b2b \ - $(COREPATH)/modules_s/ratelimit/ratelimit.c:ratelimit \ - $(COREPATH)/modules_s/sl/sl_stats.c:sl \ + $(COREPATH)/modules_s/ratelimit/ratelimit.c:ratelimit_s \ $(COREPATH)/modules_s/usrloc/ul_rpc.c:usrloc_s

14 years, 5 months

git:master: doc: cfg_list regenerated

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b72876973d820dc5a400e8a40b80ef1a4be1d6ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b728769… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Sep 2 18:22:06 2010 +0200 doc: cfg_list regenerated --- doc/cfg_list/cfg_carrierroute.txt | 26 +++ doc/cfg_list/cfg_core.txt | 57 ++++- doc/cfg_list/cfg_malloc_test.txt | 23 ++ doc/cfg_list/cfg_ratelimit.txt | 17 -- doc/cfg_list/cfg_registrar.txt | 23 ++- doc/cfg_list/cfg_tcp.txt | 9 +- doc/cfg_list/cfg_tls.txt | 176 +++++++++++++++ doc/cfg_list/cfg_tm.txt | 14 ++ doc/cfg_list/docbook/cfg_carrierroute.xml | 47 ++++ doc/cfg_list/docbook/cfg_core.xml | 63 +++++- doc/cfg_list/docbook/cfg_malloc_test.xml | 38 +++ doc/cfg_list/docbook/cfg_ratelimit.xml | 32 --- doc/cfg_list/docbook/cfg_registrar.xml | 13 + doc/cfg_list/docbook/cfg_tcp.xml | 11 + doc/cfg_list/docbook/cfg_tls.xml | 351 +++++++++++++++++++++++++++++ doc/cfg_list/docbook/cfg_tm.xml | 26 +++ doc/cfg_list/docbook/cfg_var_list.xml | 8 +- 17 files changed, 855 insertions(+), 79 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b72…

14 years, 5 months

git:master: doc: cfg_list: updated list of cfg defs files

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 01e6e63831143e6cdb599945aa0da53f5e140d74 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=01e6e63… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Sep 2 17:51:04 2010 +0200 doc: cfg_list: updated list of cfg defs files Removed ratelimit(k) (no longer contains runtime cfg vars) and added carrierroute, malloc_test and tls to the default list. --- doc/cfg_list/Makefile | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/cfg_list/Makefile b/doc/cfg_list/Makefile index 2aa9756..7af9402 100644 --- a/doc/cfg_list/Makefile +++ b/doc/cfg_list/Makefile @@ -22,10 +22,12 @@ files_list= \ $(COREPATH)/sctp_options.c:sctp \ $(COREPATH)/tcp_options.c:tcp \ $(COREPATH)/modules/tm/config.c:tm \ - $(COREPATH)/modules_k/ratelimit/config.c:ratelimit \ $(COREPATH)/modules_k/registrar/config.c:registrar \ $(COREPATH)/modules_k/siputils/config.c:siputils \ - $(COREPATH)/modules_s/maxfwd/maxfwd.c:maxfwd + $(COREPATH)/modules_s/maxfwd/maxfwd.c:maxfwd \ + $(COREPATH)/modules/carrierroute/config.c:carrierroute \ + $(COREPATH)/modules/malloc_test/malloc_test.c:malloc_test \ + $(COREPATH)/modules/tls/tls_cfg.c:tls @@ -156,6 +158,8 @@ INCLUDES:= # extract all the includes and defs from the module makefile and # evaluate them $$(eval $$(call get_make_vars,$$(dir $$(call get_prereq,$(1))))) +# override COREPATH (we know better) +COREPATH=../.. # save the result in a per group e_idefs_<grp_name> var $$(eval e_idefs_$$(call get_grp,$(1)):=$$(DEFS) $$(INCLUDES))

14 years, 5 months

git:master: also add pdb files to ignore list

by Henning Westerholt

Module: sip-router Branch: master Commit: 097ef991f18b922803f7cb266c00802b52f72cff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=097ef99… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Sep 2 18:42:44 2010 +0200 also add pdb files to ignore list --- .gitignore | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 1b8aa7c..6cdbafa 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,8 @@ TAGS test/udp_flood utils/gen_ha1/gen_ha1 utils/sercmd/sercmd +utils/pdbt/pdb_server +utils/pdbt/pdbt # Emacs backup files *~ # Emacs file locks @@ -35,4 +37,5 @@ utils/sercmd/sercmd # MacOSX auto-generated files libiname.lst *.dylib +# man pages *.7 \ No newline at end of file

14 years, 5 months

git:master: add generated man pages to git ignore list, reported from Ovidiu

by Henning Westerholt

Module: sip-router Branch: master Commit: 6b2829bfd1041b6ac3bdee9c18acfb366bec8281 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b2829b… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Sep 2 18:40:20 2010 +0200 add generated man pages to git ignore list, reported from Ovidiu --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index c4a7075..1b8aa7c 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ utils/sercmd/sercmd # MacOSX auto-generated files libiname.lst *.dylib +*.7 \ No newline at end of file

14 years, 5 months

Table version problems

by Raúl Alexis Betancor Santana

Hi ... jus trying Kam 3.0.3 ... I get blocked on this error: ERROR: <core> [db.c:408]: invalid version 0 for table 0 found, expected 6 (check table structure and table "version") ERROR: auth_db [authdb_mod.c:250]: error during table version check. It should be checking agains subscriber table version ... but I don't know why it try to found '0' table ... if I do a: insert into version (table_name,table_version) values('0','6'); It get solved ... but thats only a trick. -- Raúl Alexis Betancor Santana Dimensión Virtual

14 years, 5 months

git:master: db_mysql: fixed driver error counter named

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: e7a7c4e0a876b5eb2ed6a36a9667f10840864adf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e7a7c4e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 1 19:03:47 2010 +0200 db_mysql: fixed driver error counter named Changed the name from "Mysql driver erros" to "driver_errors" (spaces in the name, while legal, would make life harder). --- modules/db_mysql/mysql_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_mysql/mysql_mod.c b/modules/db_mysql/mysql_mod.c index 014e396..127ad52 100644 --- a/modules/db_mysql/mysql_mod.c +++ b/modules/db_mysql/mysql_mod.c @@ -59,7 +59,7 @@ unsigned long my_client_ver = 0; struct mysql_counters_h mysql_cnts_h; counter_def_t mysql_cnt_defs[] = { - {&mysql_cnts_h.driver_err, "Mysql driver erros", 0, 0, 0, + {&mysql_cnts_h.driver_err, "driver_errors", 0, 0, 0, "incremented each time a Mysql error happened because the server/connection has failed."}, {0, 0, 0, 0, 0, 0 } };

14 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev