Module: sip-router
Branch: master
Commit: 380398ad08e1080ea3a2f7d521aeb4c8aa04bef6
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=380398a…
Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org>
Date: Wed Jul 8 18:41:38 2009 +0200
makefile: more modules groups and make modules-all
- added more module groups (db, mysql_driver, postgres_driver)
- cleaned up module groups usage (replaced a lot of ifs with a
foreach)
- modules-all is now a synonym for every-module
---
INSTALL | 17 ++++++++++++++---
Makefile | 43 ++++++++++++++-----------------------------
Makefile.targets | 2 +-
3 files changed, 29 insertions(+), 33 deletions(-)
diff --git a/INSTALL b/INSTALL
index dc2c93f..461bd8a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -171,7 +171,11 @@ Compile SIP Router core only:
make #builds only sip-router core, equivalent to make sip-router
Compile modules except some explicitly excepted (see below)
-make modules
+make modules - all modules in the modules/ directory (common modules)
+make modules_s - all modules in the modules_s/ directory (ser modules)
+make modules_k - all modules in the modules_k/ directory (kamailio modules)
+make modules-all or make every-module - all the modules (modules, modules_s
+ and module_k)
Compile all:
make all
@@ -189,7 +193,12 @@ standard - Modules in this group are considered a standard part of SIP Router (d
but they have no dependencies (note that some of these interplay with external systems.
However, they don't have compile or link dependencies).
-standard-dep - Modules in this group are considered a standard part of SIP Router (due to widespread usage)
+db - Modules in this group use databases and need a database driver to run.
+ Included are drivers for the text mode db (dbtext) and for dumping
+ large ammount of data to files (db_flatstore). See also the mysql or
+ postgres groups.
+
+standard_dep - Modules in this group are considered a standard part of SIP Router (due to widespread usage)
but they have dependencies that most be satisfied for compilation.
NOTE! All presence modules (dialog, pa, presence_b2b, rls, xcap) have been included in this
group due to interdependencies
@@ -208,7 +217,9 @@ make group_include="standard standard-dep stable experimental" all
There are also in addition some "convenience" groups:
-mysql - Include all modules dependent on mysql
+mysql - Include all the db modules dependent and the mysql db driver
+
+postgres - Include all the db modules and the postgres db driver
radius - Include all modules on radiusclient
diff --git a/Makefile b/Makefile
index e203739..a12d685 100644
--- a/Makefile
+++ b/Makefile
@@ -155,9 +155,17 @@ module_group_standard_dep=acc_db acc_radius auth_db auth_radius avp_db \
db_ops domain lcr msilo mysql dialog pa postgres \
presence_b2b rls speeddial uri_db xcap xmlrpc
+# For db use (db modules, excluding drivers)
+module_group_db=acc_db auth_db avp_db db_ops db_flatstore dbtext db_text \
+ uri_db domain lcr msilo speeddial
+
# For mysql
-module_group_mysql=acc_db auth_db avp_db db_ops db_mysql uri_db domain lcr \
- msilo speeddial
+module_group_mysql_driver=db_mysql
+module_group_mysql=$(module_group_mysql_driver) $(module_group_db)
+
+# For postgress
+module_group_postgres_driver=db_postgres
+module_group_postgres=$(module_group_postgres_driver) $(module_group_db)
# For radius
module_group_radius=acc_radius auth_radius avp_radius misc_radius peering
@@ -212,32 +220,9 @@ endif
override exclude_modules+= CVS $(skip_modules)
# Test for the groups and add to include_modules
-ifneq (,$(findstring standard,$(group_include)))
- override include_modules+= $(module_group_standard)
-endif
-
-ifneq (,$(findstring standard-dep,$(group_include)))
- override include_modules+= $(module_group_standard_dep)
-endif
-
-ifneq (,$(findstring mysql,$(group_include)))
- override include_modules+= $(module_group_mysql)
-endif
-
-ifneq (,$(findstring radius,$(group_include)))
- override include_modules+= $(module_group_radius)
-endif
-
-ifneq (,$(findstring presence,$(group_include)))
- override include_modules+= $(module_group_presence)
-endif
-
-ifneq (,$(findstring stable,$(group_include)))
- override include_modules+= $(module_group_stable)
-endif
-
-ifneq (,$(findstring experimental,$(group_include)))
- override include_modules+= $(module_group_experimental)
+ifneq (,$(group_include))
+override include_modules+=$(foreach grp, $(group_include), \
+ $(module_group_$(grp)) )
endif
# first 2 lines are excluded because of the experimental or incomplete
@@ -627,7 +612,7 @@ $(foreach mods,$(modules_dirs),$(eval $(call MODULES_RULES_template,$(mods))))
#$(foreach mods,$(modules_dirs),$(eval $(info DUMP: $(call MODULES_RULES_template,$(mods)))))
# build all the modules
-every-module: $(modules_dirs)
+modules-all every-module: $(modules_dirs)
$(extra_objs):
@echo "Extra objs: $(extra_objs)"
diff --git a/Makefile.targets b/Makefile.targets
index 43d5d2b..3541bfe 100644
--- a/Makefile.targets
+++ b/Makefile.targets
@@ -37,7 +37,7 @@ aux_targets:= TAGS tar dist cfg-defs cfg config config.mak print-modules \
dbg dbinstall librpath.lst makecfg.lst modules.lst modules-cfg \
modules-list modules-lst mk-install_dirs autover.h deb
# other targets that don't produce code in the current directory ("external")
-ext_targets:= every-module $(modules_dirs) libs utils \
+ext_targets:= every-module modules-all $(modules_dirs) libs utils \
install-cfg install-utils install-modules-all install-every-module\
$(foreach m,$(modules_dirs),install-$(m)) \
install-share
Hi,
I just did a git clone and tried to make SR deb packages, but I'm
getting the following error:
../../lib/kcore/../../atomic/atomic_unknown.h: At top level:
../../lib/kcore/../../atomic/atomic_unknown.h:60: error: expected ‘=’,
‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘*’ token
../../lib/kcore/../../atomic/atomic_unknown.h:136: error: expected
‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘*’ token
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_inc_int’:
../../lib/kcore/../../atomic/atomic_unknown.h:206: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h:206: error: (Each
undeclared identifier is reported only once
../../lib/kcore/../../atomic/atomic_unknown.h:206: error: for each
function it appears in.)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_dec_int’:
../../lib/kcore/../../atomic/atomic_unknown.h:207: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_and_int’:
../../lib/kcore/../../atomic/atomic_unknown.h:208: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_or_int’:
../../lib/kcore/../../atomic/atomic_unknown.h:209: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_inc_and_test_int’:
../../lib/kcore/../../atomic/atomic_unknown.h:210: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_dec_and_test_int’:
../../lib/kcore/../../atomic/atomic_unknown.h:211: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_get_and_set_int’:
../../lib/kcore/../../atomic/atomic_unknown.h:212: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_cmpxchg_int’:
../../lib/kcore/../../atomic/atomic_unknown.h:213: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_add_int’:
../../lib/kcore/../../atomic/atomic_unknown.h:216: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_inc_long’:
../../lib/kcore/../../atomic/atomic_unknown.h:218: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_dec_long’:
../../lib/kcore/../../atomic/atomic_unknown.h:219: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_and_long’:
../../lib/kcore/../../atomic/atomic_unknown.h:220: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_or_long’:
../../lib/kcore/../../atomic/atomic_unknown.h:221: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_inc_and_test_long’:
../../lib/kcore/../../atomic/atomic_unknown.h:222: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_dec_and_test_long’:
../../lib/kcore/../../atomic/atomic_unknown.h:223: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_get_and_set_long’:
../../lib/kcore/../../atomic/atomic_unknown.h:224: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_cmpxchg_long’:
../../lib/kcore/../../atomic/atomic_unknown.h:225: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘atomic_add_long’:
../../lib/kcore/../../atomic/atomic_unknown.h:228: error:
‘_atomic_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘mb_atomic_get_int’:
../../lib/kcore/../../atomic/atomic_unknown.h:257: error:
‘__membar_lock’ undeclared (first use in this function)
../../lib/kcore/../../atomic/atomic_unknown.h: In function
‘mb_atomic_get_long’:
../../lib/kcore/../../atomic/atomic_unknown.h:270: error:
‘__membar_lock’ undeclared (first use in this function)
enum_mod.c: At top level:
enum_mod.c:40: error: ‘NAME’ undeclared here (not in a function)
enum_mod.c:40: error: expected ‘,’ or ‘;’ before string constant
make[3]: *** [enum_mod.o] Error 1
make[3]: se sale del directorio `/usr/src/sip-router/modules/enum'
make[2]: *** [modules] Error 1
make[2]: se sale del directorio `/usr/src/sip-router'
make[1]: *** [build-stamp] Error 2
make[1]: se sale del directorio `/usr/src/sip-router'
dpkg-buildpackage: failure: debian/rules build gave error exit status
2
make: [deb] Error 2 (no tiene efecto)
All dependencies seem to de installed, and I'm using Debian Lenny. Is
there anything I can test to try to get it compile?
Thanks in advance!
--
Saúl -- "Nunca subestimes el ancho de banda de un camión lleno de disketes."
----------------------------------------------------------------
http://www.saghul.net/
Hi!
When I perform
make; make install
the config script will be copied to /usr/local/etc/ser/ser.cfg, but ser
is looking for /usr/local/etc/ser/sip-router.cfg
regards
klaus
Hi!
I tested starting ser with all common and ser's modules - in arbitrary
order. Of course this failed, nevertheless ser should not crash:
root@flunder:/# ser
loading modules under
/usr/local/lib/ser/modules:/usr/local/lib/ser/modules_s
ERROR: bad config file (29 errors)
Segmentation fault (core dumped)
backtrace:
Core was generated by `ser'.
Program terminated with signal 11, Segmentation fault.
[New process 25251]
#0 0xb6fa08f4 in tree_get () at tree.c:290
290 tree = *shared_tree;
(gdb) bt
#0 0xb6fa08f4 in tree_get () at tree.c:290
#1 0xb6fa0a34 in tree_close () at tree.c:337
#2 0xb6f9f428 in mod_destroy () at prefix_route.c:222
#3 0x080ea281 in destroy_modules () at sr_module.c:631
#4 0x080896f8 in cleanup (show_status=0) at main.c:501
#5 0x0808a114 in shutdown_children (sig=15, show_status=0) at main.c:621
#6 0x0808f45b in main (argc=1, argv=0xbfffa134) at main.c:2116
regards
Klaus
Module: sip-router
Branch: master
Commit: a506fcc07a9c30f7f0e79c1ba858444d8a81e395
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a506fcc…
Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org>
Date: Wed Jul 8 17:36:38 2009 +0200
debian: updated debian spec for sip-router
- fixed & cleaned "rules", they now use make cfg and are generally simpler
- added a ser-tls package
- re-enabled the ser-postgres package
Note: right now the packages being built will be called "ser*",
but they do include all the modules.
---
pkg/debian/changelog | 6 ++
pkg/debian/control | 27 ++++++---
pkg/debian/rules | 152 ++++++++++++++------------------------------------
3 files changed, 65 insertions(+), 120 deletions(-)
Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a50…
Bugs item #2818273, was opened at 2009-07-07 23:28
Message generated for change (Comment added) made by nobody
You can respond by visiting:
https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2818273&group_…
Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: ver 1.5.x
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Nobody/Anonymous (nobody)
Assigned to: Nobody/Anonymous (nobody)
Summary: crash when Content-length too big
Initial Comment:
Recently we encountered some crashes of kamailio 1.5.0 caused by messages with too big value of Content-length (more than 30000). When the parser in nathelper.c looks for old and new port it sometimes finds occurences after the real end of the message. Then the sanity check in del_lump() in data_lump.c finds that either offset or offset+len is greater than msg->len and calls abort().
----------------------------------------------------------------------
Comment By: Nobody/Anonymous (nobody)
Date: 2009-07-08 15:17
Message:
'kamailio -V' says 'kamailio 1.5.0-notls (x86_64/linux)'
----------------------------------------------------------------------
Comment By: Klaus Darilion (klaus_darilion)
Date: 2009-07-08 08:38
Message:
Which excat version are you using? There were some bugfixes recently.
----------------------------------------------------------------------
You can respond by visiting:
https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2818273&group_…