sr-dev May 2012

sr-dev@lists.kamailio.org

29 participants
173 discussions

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by admin＠sip-router.org 09 May '12

09 May '12

Module: sip-router Branch: master Commit: 1d23563dd6ff1411c84ebb6961777b83c0efd0ef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1d23563… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed May 9 07:44:58 2012 +0300 Merge branch 'master' of ssh://git.sip-router.org/sip-router Forgot to pull before commit. ---

1 0

Documentation error
by Pierre St-Germain 08 May '12

08 May '12

There is few configuration that not works in the documentation for Kamailio 3.2.0 For example: in http://kamailio.org/docs/modules/3.2.x/modules_k/acc.html modparam("acc", "radius_config", "/etc/radiusclient/radiusclient.conf") modparam("acc", "radius_extra", "via=$hdr(Via[*]); email=$avp(s:email)") Give errors : set_mod_param_regex: parameter <radius_extra> not found in module <acc> Thanks to review the deprecated parameters modules Pierre St-Germain

2 1

git:master: kamctl: added 'address' command
by Daniel-Constantin Mierla 08 May '12

08 May '12

Module: sip-router Branch: master Commit: 7b976204796a2260775dfd094cc388bde0a63ea9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b97620… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 8 19:35:29 2012 +0200 kamctl: added 'address' command - handle records for address table of permissions module --- utils/kamctl/kamctl | 88 +++++++++++++++++++++++++++++++++++++++++---- utils/kamctl/kamctl.base | 28 +++++++++++--- 2 files changed, 102 insertions(+), 14 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 5e0d7a7..2cfb951 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1051,9 +1051,9 @@ domain() { # ##### ------------------------------------------------ ##### -### trusted management +### permissions trusted management # -trusted() { +permissions_trusted() { case $1 in reload) require_ctlengine @@ -1123,6 +1123,78 @@ trusted() { esac } + +# +##### ------------------------------------------------ ##### +### permissions address management +# +permissions_address() { + case $1 in + reload) + require_ctlengine + $CTLCMD address_reload + ;; + dump) + require_ctlengine + $CTLCMD address_dump + ;; + show) + require_dbengine + QUERY="select * FROM $ADDRESS_TABLE ; " + $DBROCMD "$QUERY" + ;; + add) + require_dbengine + shift + if [ $# -lt 2 ] ; then + usage_address + exit 1 + fi + AMASK=32 + if [ ! -z "$3" ]; then + AMASK="$3" + fi + APORT=0 + if [ ! -z "$4" ]; then + APORT="$4" + fi + ATAG="" + if [ ! -z "$5" ]; then + ATAG="$5" + fi + + QUERY="insert into $ADDRESS_TABLE \ + (grp, ip_addr, mask, port, tag) \ + VALUES ($1, '$2', $AMASK, $APORT, '$ATAG');" + $DBCMD "$QUERY" + if [ $? -ne 0 ] ; then + merr "permissions address - SQL Error" + exit 1 + fi + minfo "execute '$0 address reload' to synchronize cache and database" + ;; + rm) + require_dbengine + shift + if [ $# -ne 2 ] ; then + usage_address + exit 1 + fi + QUERY="delete from $ADDRESS_TABLE where grp=$1 and ip_addr='$2';" + $DBCMD "$QUERY" + if [ $? -ne 0 ] ; then + merr "permissions address - SQL Error" + exit 1 + fi + minfo "execute '$0 address reload' to synchronize cache and database" + ;; + *) + usage_address + exit 1 + esac +} + + # ##### ------------------------------------------------ ##### ### LCR management @@ -2402,7 +2474,12 @@ case $1 in trusted) shift - trusted "$@" + permissions_trusted "$@" + ;; + + address) + shift + permissions_address "$@" ;; fifo|mi|unixsock|ser_mi|sercmd_mi|sercmdmi) @@ -2427,11 +2504,6 @@ case $1 in cr "$@" ;; - trusted) - shift - trusted "$@" - ;; - dispatcher) shift dispatcher "$@" diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 11c398d..dd4635f 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -180,11 +180,6 @@ fi DO_DOMAIN_COLUMN=domain DO_LAST_MODIFIED_COLUMN=last_modified -# trusted table -if [ -z "$TRUSTED_TABLE" ] ; then - TRUSTED_TABLE=trusted -fi - # lcr tables if [ -z "$LCR_TABLE" ] ; then LCR_TABLE=lcr @@ -279,6 +274,11 @@ TRUSTED_PROTO_COLUMN=proto TRUSTED_FROM_PATTERN_COLUMN=from_pattern TRUSTED_TAG_COLUMN=tag +# address table +if [ -z "$ADDRESS_TABLE" ] ; then + ADDRESS_TABLE=address +fi + # dispatcher tables if [ -z "$DISPATCHER_TABLE" ] ; then DISPATCHER_TABLE=dispatcher @@ -416,7 +416,23 @@ cat <<EOF trusted add <src_ip> <proto> <from_pattern> <tag> ....................... add a new entry ....................... (from_pattern and tag are optional arguments) - trusted rm <src_ip> ............... remove all entres for the given src_ip + trusted rm <src_ip> ............... remove all entries for the given src_ip +EOF +} +USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_trusted" + +usage_address() { + echo + mecho " -- command 'add|dump|reload|rm|show' - manage address" + echo +cat <<EOF + address show ...................... show db content + address dump ...................... show cache content + address reload .................... reload db table into cache + address add <grp> <ipaddr> <mask> <port> <tag> + ....................... add a new entry + ....................... (mask, port and tag are optional arguments) + address rm <grp> <ipaddr> ......... remove entries for given grp and ipaddr EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_trusted"

1 0

git:master: pkg/kamailio/fedora: removed unused variable
by Peter Dunkley 08 May '12

08 May '12

Module: sip-router Branch: master Commit: 85df477b667ba1342f7f8123c169b8c4da072ffb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=85df477… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue May 8 17:08:50 2012 +0100 pkg/kamailio/fedora: removed unused variable --- pkg/kamailio/fedora/kamailio.sysconfig | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/pkg/kamailio/fedora/kamailio.sysconfig b/pkg/kamailio/fedora/kamailio.sysconfig index 08dda22..8eb8f51 100644 --- a/pkg/kamailio/fedora/kamailio.sysconfig +++ b/pkg/kamailio/fedora/kamailio.sysconfig @@ -2,9 +2,6 @@ # Kamailio startup options # -# PID file for Kamailio -PID_FILE=/var/run/kamailio.pid - # Options to pass when starting Kamailio # Note: variable interpolation is not supported by systemd so $OPTIONS cannot # be constructed from multiple variables.

1 0

git:master: modules_k/rls: Tidied up some of the DB query stuff in RLS
by Peter Dunkley 08 May '12

08 May '12

Module: sip-router Branch: master Commit: f2fee212edbe6c99fdbd8bced39a449b0e91d35b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f2fee21… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue May 8 16:42:22 2012 +0100 modules_k/rls: Tidied up some of the DB query stuff in RLS --- modules_k/rls/resource_notify.c | 95 ++++++++++++++++++++------------------ modules_k/rls/rls_db.c | 21 +++++---- 2 files changed, 61 insertions(+), 55 deletions(-) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index ba4af35..b1da62a 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -847,6 +847,11 @@ static void timer_send_full_state_notifies(int round) db_row_t *rows; db1_res_t *result = NULL; int n_result_cols = 0, i; + int pres_uri_col, tuser_col, tdomain_col, fuser_col, fdomain_col; + int wuser_col, wdomain_col, callid_col, to_tag_col, from_tag_col; + int sockinfo_col, lcontact_col, contact_col, rroute_col, event_id_col; + int reason_col, event_col, lcseq_col, rcseq_col, status_col; + int version_col, expires_col; subs_t sub; str ev_sname; event_t parsed_event; @@ -859,28 +864,28 @@ static void timer_send_full_state_notifies(int round) query_vals[0].nul = 0; query_vals[0].val.int_val = round; - result_cols[n_result_cols++] = &str_presentity_uri_col; - result_cols[n_result_cols++] = &str_to_user_col; - result_cols[n_result_cols++] = &str_to_domain_col; - result_cols[n_result_cols++] = &str_from_user_col; - result_cols[n_result_cols++] = &str_from_domain_col; - result_cols[n_result_cols++] = &str_watcher_username_col; - result_cols[n_result_cols++] = &str_watcher_domain_col; - result_cols[n_result_cols++] = &str_callid_col; - result_cols[n_result_cols++] = &str_to_tag_col; - result_cols[n_result_cols++] = &str_from_tag_col; - result_cols[n_result_cols++] = &str_socket_info_col; - result_cols[n_result_cols++] = &str_local_contact_col; - result_cols[n_result_cols++] = &str_contact_col; - result_cols[n_result_cols++] = &str_record_route_col; - result_cols[n_result_cols++] = &str_event_id_col; - result_cols[n_result_cols++] = &str_reason_col; - result_cols[n_result_cols++] = &str_event_col; - result_cols[n_result_cols++] = &str_local_cseq_col; - result_cols[n_result_cols++] = &str_remote_cseq_col; - result_cols[n_result_cols++] = &str_status_col; - result_cols[n_result_cols++] = &str_version_col; - result_cols[n_result_cols++] = &str_expires_col; + result_cols[pres_uri_col = n_result_cols++] = &str_presentity_uri_col; + result_cols[tuser_col = n_result_cols++] = &str_to_user_col; + result_cols[tdomain_col = n_result_cols++] = &str_to_domain_col; + result_cols[fuser_col = n_result_cols++] = &str_from_user_col; + result_cols[fdomain_col = n_result_cols++] = &str_from_domain_col; + result_cols[wuser_col = n_result_cols++] = &str_watcher_username_col; + result_cols[wdomain_col = n_result_cols++] = &str_watcher_domain_col; + result_cols[callid_col = n_result_cols++] = &str_callid_col; + result_cols[to_tag_col = n_result_cols++] = &str_to_tag_col; + result_cols[from_tag_col = n_result_cols++] = &str_from_tag_col; + result_cols[sockinfo_col = n_result_cols++] = &str_socket_info_col; + result_cols[lcontact_col = n_result_cols++] = &str_local_contact_col; + result_cols[contact_col = n_result_cols++] = &str_contact_col; + result_cols[rroute_col = n_result_cols++] = &str_record_route_col; + result_cols[event_id_col = n_result_cols++] = &str_event_id_col; + result_cols[reason_col = n_result_cols++] = &str_reason_col; + result_cols[event_col = n_result_cols++] = &str_event_col; + result_cols[lcseq_col = n_result_cols++] = &str_local_cseq_col; + result_cols[rcseq_col = n_result_cols++] = &str_remote_cseq_col; + result_cols[status_col = n_result_cols++] = &str_status_col; + result_cols[version_col = n_result_cols++] = &str_version_col; + result_cols[expires_col = n_result_cols++] = &str_expires_col; update_cols[0] = &str_updated_col; update_vals[0].type = DB1_INT; @@ -936,23 +941,23 @@ static void timer_send_full_state_notifies(int round) { memset(&sub, 0, sizeof(subs_t)); values = ROW_VALUES(&rows[i]); - EXTRACT_STRING(sub.pres_uri, VAL_STRING(&values[0])); - EXTRACT_STRING(sub.to_user, VAL_STRING(&values[1])); - EXTRACT_STRING(sub.to_domain, VAL_STRING(&values[2])); - EXTRACT_STRING(sub.from_user, VAL_STRING(&values[3])); - EXTRACT_STRING(sub.from_domain, VAL_STRING(&values[4])); - EXTRACT_STRING(sub.watcher_user, VAL_STRING(&values[5])); - EXTRACT_STRING(sub.watcher_domain, VAL_STRING(&values[6])); - EXTRACT_STRING(sub.callid, VAL_STRING(&values[7])); - EXTRACT_STRING(sub.to_tag, VAL_STRING(&values[8])); - EXTRACT_STRING(sub.from_tag, VAL_STRING(&values[9])); - EXTRACT_STRING(sub.sockinfo_str, VAL_STRING(&values[10])); - EXTRACT_STRING(sub.local_contact, VAL_STRING(&values[11])); - EXTRACT_STRING(sub.contact, VAL_STRING(&values[12])); - EXTRACT_STRING(sub.record_route, VAL_STRING(&values[13])); - EXTRACT_STRING(sub.event_id, VAL_STRING(&values[14])); - EXTRACT_STRING(sub.reason, VAL_STRING(&values[15])); - EXTRACT_STRING(ev_sname, VAL_STRING(&values[16])); + EXTRACT_STRING(sub.pres_uri, VAL_STRING(&values[pres_uri_col])); + EXTRACT_STRING(sub.to_user, VAL_STRING(&values[tuser_col])); + EXTRACT_STRING(sub.to_domain, VAL_STRING(&values[tdomain_col])); + EXTRACT_STRING(sub.from_user, VAL_STRING(&values[fuser_col])); + EXTRACT_STRING(sub.from_domain, VAL_STRING(&values[fdomain_col])); + EXTRACT_STRING(sub.watcher_user, VAL_STRING(&values[wuser_col])); + EXTRACT_STRING(sub.watcher_domain, VAL_STRING(&values[wdomain_col])); + EXTRACT_STRING(sub.callid, VAL_STRING(&values[callid_col])); + EXTRACT_STRING(sub.to_tag, VAL_STRING(&values[to_tag_col])); + EXTRACT_STRING(sub.from_tag, VAL_STRING(&values[from_tag_col])); + EXTRACT_STRING(sub.sockinfo_str, VAL_STRING(&values[sockinfo_col])); + EXTRACT_STRING(sub.local_contact, VAL_STRING(&values[lcontact_col])); + EXTRACT_STRING(sub.contact, VAL_STRING(&values[contact_col])); + EXTRACT_STRING(sub.record_route, VAL_STRING(&values[rroute_col])); + EXTRACT_STRING(sub.event_id, VAL_STRING(&values[event_id_col])); + EXTRACT_STRING(sub.reason, VAL_STRING(&values[reason_col])); + EXTRACT_STRING(ev_sname, VAL_STRING(&values[event_col])); sub.event = pres_contains_event(&ev_sname, &parsed_event); if (sub.event == NULL) { @@ -960,12 +965,12 @@ static void timer_send_full_state_notifies(int round) goto done; } - sub.local_cseq = VAL_INT(&values[17]); - sub.remote_cseq = VAL_INT(&values[18]); - sub.status = VAL_INT(&values[19]); - sub.version = VAL_INT(&values[20]); - if (VAL_INT(&values[21]) > now) - sub.expires = VAL_INT(&values[21]) - now; + sub.local_cseq = VAL_INT(&values[lcseq_col]); + sub.remote_cseq = VAL_INT(&values[rcseq_col]); + sub.status = VAL_INT(&values[status_col]); + sub.version = VAL_INT(&values[version_col]); + if (VAL_INT(&values[expires_col]) > now) + sub.expires = VAL_INT(&values[expires_col]) - now; else sub.expires = 0; diff --git a/modules_k/rls/rls_db.c b/modules_k/rls/rls_db.c index a4e7327..052a0e7 100644 --- a/modules_k/rls/rls_db.c +++ b/modules_k/rls/rls_db.c @@ -714,6 +714,7 @@ int get_dialog_subscribe_rlsdb(subs_t *subs) db_key_t result_cols[5]; db_row_t *rows; int n_query_cols = 0, n_result_cols = 0; + int pres_uri_col, rcseq_col, lcseq_col, version_col, rroute_col; int nr_rows; int r_remote_cseq, r_local_cseq, r_version; char *r_pres_uri, *r_record_route; @@ -754,11 +755,11 @@ int get_dialog_subscribe_rlsdb(subs_t *subs) query_vals[n_query_cols].val.str_val= subs->from_tag; n_query_cols++; - result_cols[n_result_cols++] = &str_presentity_uri_col; - result_cols[n_result_cols++] = &str_remote_cseq_col; - result_cols[n_result_cols++] = &str_local_cseq_col; - result_cols[n_result_cols++] = &str_version_col; - result_cols[n_result_cols++] = &str_record_route_col; + result_cols[pres_uri_col = n_result_cols++] = &str_presentity_uri_col; + result_cols[rcseq_col = n_result_cols++] = &str_remote_cseq_col; + result_cols[lcseq_col = n_result_cols++] = &str_local_cseq_col; + result_cols[version_col = n_result_cols++] = &str_version_col; + result_cols[rroute_col = n_result_cols++] = &str_record_route_col; if(rls_dbf.query(rls_db, query_cols, 0, query_vals, result_cols, n_query_cols, n_result_cols, 0, &result )< 0) @@ -791,11 +792,11 @@ int get_dialog_subscribe_rlsdb(subs_t *subs) rows = RES_ROWS(result); values = ROW_VALUES(rows); - r_pres_uri = (char *)VAL_STRING(values+0); - r_remote_cseq = VAL_INT(values+1); - r_local_cseq = VAL_INT(values+2); - r_version = VAL_INT(values+3); - r_record_route = (char *)VAL_STRING(values+4); + r_pres_uri = (char *)VAL_STRING(&values[pres_uri_col]); + r_remote_cseq = VAL_INT(&values[rcseq_col]); + r_local_cseq = VAL_INT(&values[lcseq_col]); + r_version = VAL_INT(&values[version_col]); + r_record_route = (char *)VAL_STRING(&values[rroute_col]); if(strlen(r_pres_uri) > 0) {

1 0

git:master: modules_k/presence: Dedicated notifier processes
by Peter Dunkley 08 May '12

08 May '12

Module: sip-router Branch: master Commit: 8485536f1fd56127e38101d48d02afbacd5f4f6d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8485536… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue May 8 16:47:07 2012 +0100 modules_k/presence: Dedicated notifier processes - This fixes a bug in presence where, when subs_db_mode is database only, under high loads with lots of presentity changes you can get several different NOTIFY requests sent with the same CSeq. - The dedicated notifier processes only work when in database only mode. - The dedicated notifier processes are enabled (with one notifier process) by default when in database only mode. - You can disable the dedicated notifier processes by setting the "notifier_processes" modparam to 0. - The notifier processes are executed on a timer and deal with a small amount of the outstanding notifications each time they run. By default (changeable through the "waitn_time" modparam) all dialogs are processed every five seconds. This means it will take between 0 and five seconds (on average 2.5 seconds) between a presentity or dialog update occurring and a NOTIFY request being sent. --- modules_k/presence/README | 246 +++++--- modules_k/presence/doc/presence_admin.xml | 85 +++- modules_k/presence/notify.c | 1054 ++++++++++++++++++++++++++++- modules_k/presence/notify.h | 4 + modules_k/presence/presence.c | 116 +++- modules_k/presence/presence.h | 7 + modules_k/presence/presentity.c | 246 +++++++- modules_k/presence/presentity.h | 2 + modules_k/presence/publish.c | 70 ++- modules_k/presence/subscribe.c | 200 +++++- modules_k/presence/subscribe.h | 1 + 11 files changed, 1837 insertions(+), 194 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=848…

1 0

git:master: pkg/kamailio/fedora: Updated Fedora pkg files to use systemd instead of SysV init
by Peter Dunkley 07 May '12

07 May '12

Module: sip-router Branch: master Commit: 627a9e402c8e9d1a1251ff7d40043f4f6c8fc2bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=627a9e4… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue May 8 00:00:48 2012 +0100 pkg/kamailio/fedora: Updated Fedora pkg files to use systemd instead of SysV init --- pkg/kamailio/fedora/kamailio.default | 25 ------ pkg/kamailio/fedora/kamailio.init | 127 -------------------------------- pkg/kamailio/fedora/kamailio.service | 12 +++ pkg/kamailio/fedora/kamailio.spec | 24 +++--- pkg/kamailio/fedora/kamailio.sysconfig | 17 ++++ 5 files changed, 42 insertions(+), 163 deletions(-) diff --git a/pkg/kamailio/fedora/kamailio.default b/pkg/kamailio/fedora/kamailio.default deleted file mode 100644 index d962311..0000000 --- a/pkg/kamailio/fedora/kamailio.default +++ /dev/null @@ -1,25 +0,0 @@ -# -# Kamailio startup options -# - -# Set to yes to enable kamailio, once configured properly. -RUN_KAMAILIO=yes - -# User to run as -USER=kamailio - -# Group to run as -GROUP=kamailio - -# Amount of memory to allocate for the running Kamailio server (in Mb) -MEMORY=64 - -# Enable the server to leave a core file when it crashes. -# Set this to 'yes' to enable kamailio to leave a core file when it crashes -# or 'no' to disable this feature. This option is case sensitive and only -# accepts 'yes' and 'no' and only in lowercase letters. -# On some systems (e.g. Ubuntu 6.10, Debian 4.0) it is necessary to specify -# a directory for the core files to get a dump. Look into the kamailio -# init file for an example configuration. -DUMP_CORE=no - diff --git a/pkg/kamailio/fedora/kamailio.init b/pkg/kamailio/fedora/kamailio.init deleted file mode 100644 index 8d8d4b7..0000000 --- a/pkg/kamailio/fedora/kamailio.init +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/bash -# -# Startup script for Kamailio -# -# chkconfig: 345 85 15 -# description: Kamailio (OpenSER) - the Open Source SIP Server -# -# processname: kamailio -# pidfile: /var/run/kamailio.pid -# config: /etc/kamailio/kamailio.cfg - -# Source function library. -. /etc/rc.d/init.d/functions - -KAM=/usr/sbin/kamailio -PROG=kamailio -PID_FILE=/var/run/kamailio.pid -LOCK_FILE=/var/lock/subsys/kamailio -RETVAL=0 -DEFAULTS=/etc/default/kamailio -RUN_KAMAILIO=no - - -# Do not start kamailio if fork=no is set in the config file -# otherwise the boot process will just stop -check_fork () -{ - if grep -q "^[[:space:]]*fork[[:space:]]*=[[:space:]]*no.*" /etc/kamailio/kamailio.cfg; then - echo "Not starting $DESC: fork=no specified in config file; run /etc/init.d/kamailio debug instead" - exit 1 - fi -} - -check_kamailio_config () -{ - # Check if kamailio configuration is valid before starting the server - out=$($KAM -c 2>&1 > /dev/null) - retcode=$? - if [ "$retcode" != '0' ]; then - echo "Not starting $DESC: invalid configuration file!" - echo -e "\n$out\n" - exit 1 - fi -} - - -start() { - check_kamailio_config - if [ "$1" != "debug" ]; then - check_fork - fi - echo -n $"Starting $PROG: " - daemon $KAM $OPTIONS >/dev/null 2>/dev/null - RETVAL=$? - echo - [ $RETVAL = 0 ] && touch $LOCK_FILE - return $RETVAL -} - -stop() { - echo -n $"Stopping $PROG: " - killproc $KAM - RETVAL=$? - echo - [ $RETVAL = 0 ] && rm -f $LOCK_FILE $PID_FILE -} - -# Load startup options if available -if [ -f $DEFAULTS ]; then - . $DEFAULTS || true -fi - -if [ "$RUN_KAMAILIO" != "yes" ]; then - echo "Kamailio not yet configured. Edit /etc/default/kamailio first." - exit 0 -fi - - -MEMORY=$((`echo $MEMORY | sed -e 's/[^0-9]//g'`)) -PKG_MEMORY=$((`echo $PKG_MEMORY | sed -e 's/[^0-9]//g'`)) -[ -z "$USER" ] && USER=kamailio -[ -z "$GROUP" ] && GROUP=kamailio -[ $MEMORY -le 0 ] && MEMORY=32 -[ $PKG_MEMORY -le 0 ] && PKG_MEMORY=4 - -if test "$DUMP_CORE" = "yes" ; then - # set proper ulimit - ulimit -c unlimited - - # directory for the core dump files - # COREDIR=/home/corefiles - # [ -d $COREDIR ] || mkdir $COREDIR - # chmod 777 $COREDIR - # echo "$COREDIR/core.%e.sig%s.%p" > /proc/sys/kernel/core_pattern -fi - -OPTIONS="-P $PID_FILE -m $MEMORY -M $PKG_MEMORY -u $USER -g $GROUP" - - -# See how we were called. -case "$1" in - start|debug) - start - ;; - stop) - stop - ;; - status) - status $KAM - RETVAL=$? - ;; - restart) - stop - start - ;; - condrestart) - if [ -f $PID_FILE ] ; then - stop - start - fi - ;; - *) - echo $"Usage: $PROG {start|stop|restart|condrestart|status|debug|help}" - exit 1 -esac - -exit $RETVAL diff --git a/pkg/kamailio/fedora/kamailio.service b/pkg/kamailio/fedora/kamailio.service new file mode 100644 index 0000000..c811475 --- /dev/null +++ b/pkg/kamailio/fedora/kamailio.service @@ -0,0 +1,12 @@ +[Unit] +Description=Kamailio (OpenSER) - the Open Source SIP Server +After=syslog.target network.target + +[Service] +Type=forking +EnvironmentFile=/etc/sysconfig/kamailio +PIDFile=/var/run/kamailio.pid +ExecStart=/usr/sbin/kamailio $OPTIONS + +[Install] +WantedBy=multi-user.target diff --git a/pkg/kamailio/fedora/kamailio.spec b/pkg/kamailio/fedora/kamailio.spec index c09bdcc..3f42f2b 100644 --- a/pkg/kamailio/fedora/kamailio.spec +++ b/pkg/kamailio/fedora/kamailio.spec @@ -346,13 +346,13 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ klcr ksqlite kredis kjson kmono kberkeley" include_modules="xmlrpc\ xmlops" -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d -install -m755 pkg/kamailio/fedora/kamailio.init \ - $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/kamailio +mkdir -p $RPM_BUILD_ROOT/%{_unitdir} +install -m644 pkg/kamailio/fedora/kamailio.service \ + $RPM_BUILD_ROOT/%{_unitdir}/kamailio.service -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/default -install -m755 pkg/kamailio/fedora/kamailio.default \ - $RPM_BUILD_ROOT/%{_sysconfdir}/default/kamailio +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig +install -m644 pkg/kamailio/fedora/kamailio.sysconfig \ + $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/kamailio @@ -369,14 +369,14 @@ rm -rf "$RPM_BUILD_ROOT" %post -/sbin/chkconfig --add kamailio +/bin/systemctl --system daemon-reload %preun if [ $1 = 0 ]; then - /sbin/service kamailio stop > /dev/null 2>&1 - /sbin/chkconfig --del kamailio + /bin/systemctl stop kamailio.service + /bin/systemctl disable kamailio.service 2> /dev/null fi @@ -479,8 +479,8 @@ fi %dir %{_sysconfdir}/kamailio %config(noreplace) %{_sysconfdir}/kamailio/* -%config %{_sysconfdir}/rc.d/init.d/* -%config %{_sysconfdir}/default/* +%config %{_unitdir}/* +%config %{_sysconfdir}/sysconfig/* %dir %{_libdir}/kamailio %{_libdir}/kamailio/libbinrpc.so @@ -859,6 +859,8 @@ fi %changelog +* Mon May 7 2012 Peter Dunkley <peter(a)dunkley.me.uk> + - Changed to use systemd instead of SysV init. * Sun May 6 2012 Peter Dunkley <peter(a)dunkley.me.uk> - First version created for Kamailio 3.3.0. Based on spec-file for CentOS created by Ovidiu Sas. diff --git a/pkg/kamailio/fedora/kamailio.sysconfig b/pkg/kamailio/fedora/kamailio.sysconfig new file mode 100644 index 0000000..08dda22 --- /dev/null +++ b/pkg/kamailio/fedora/kamailio.sysconfig @@ -0,0 +1,17 @@ +# +# Kamailio startup options +# + +# PID file for Kamailio +PID_FILE=/var/run/kamailio.pid + +# Options to pass when starting Kamailio +# Note: variable interpolation is not supported by systemd so $OPTIONS cannot +# be constructed from multiple variables. +# -P - The PID file (this must match the value in +# /lib/systemd/system/kamailio.service) +# -m - Kamailio shared (global) memory (default 32 MB) +# -M - Kamailio package (per-process private) memory (default 4 MB) +# -u - User to run Kamailio as +# -g - Group to run Kamailio as +OPTIONS="-P /var/run/kamailio.pid -m 32 -M 4 -u kamailio -g kamailio"

1 0

git:master: modules_k/purple: Updated to compile on Fedora 16
by Peter Dunkley 07 May '12

07 May '12

Module: sip-router Branch: master Commit: fe10a2ef9d68b646885ccaa57052a7bf85fcab9e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fe10a2e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun May 6 18:40:35 2012 +0100 modules_k/purple: Updated to compile on Fedora 16 - Updated Makefile to use pkg-config so that it selects the correct libraries/versions. - Added missing include for glib.h to a few files. Not sure why this is needed now when it wasn't before - but a quick search has shown it should continue to work with older glib versions too. --- modules_k/purple/Makefile | 16 ++++++++++++---- modules_k/purple/purple.h | 1 + modules_k/purple/purplepipe.h | 1 + modules_k/purple/utils.h | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/modules_k/purple/Makefile b/modules_k/purple/Makefile index 14f7928..f5b77ad 100644 --- a/modules_k/purple/Makefile +++ b/modules_k/purple/Makefile @@ -1,12 +1,20 @@ include ../../Makefile.defs auto_gen= NAME=purple.so -LIBS= +BUILDER = $(shell which pkg-config) -DEFS+=-I/usr/lib/glib-2.0/include -I/usr/include/glib-2.0 \ +ifeq ($(BUILDER),) + DEFS+= -I/usr/lib/glib-2.0/include -I/usr/include/glib-2.0 \ -I/usr/include/libxml2 -LIBS+=-lglib-2.0 -lpurple -lxml2 - + LIBS= -lglib-2.0 -lpurple -lxml2 +else + DEFS+= $(shell pkg-config --cflags glib-2.0) + LIBS= $(shell pkg-config --libs glib-2.0) + DEFS+= $(shell pkg-config --cflags purple) + LIBS+= $(shell pkg-config --libs purple) + DEFS+= $(shell pkg-config --cflags libxml-2.0) + LIBS+= $(shell pkg-config --libs libxml-2.0) +endif DEFS+=-DOPENSER_MOD_INTERFACE diff --git a/modules_k/purple/purple.h b/modules_k/purple/purple.h index 8e58d1e..4232dff 100644 --- a/modules_k/purple/purple.h +++ b/modules_k/purple/purple.h @@ -20,6 +20,7 @@ #ifndef _PURPLE_H #define _PURPLE_H +#include <glib.h> #include <libpurple/status.h> enum purple_cmd_type { diff --git a/modules_k/purple/purplepipe.h b/modules_k/purple/purplepipe.h index 6dc0fa8..df04e32 100644 --- a/modules_k/purple/purplepipe.h +++ b/modules_k/purple/purplepipe.h @@ -21,6 +21,7 @@ #define _PURPLEPIPE_H #include <stdlib.h> +#include <glib.h> #include <libpurple/savedstatuses.h> #include <libpurple/status.h> diff --git a/modules_k/purple/utils.h b/modules_k/purple/utils.h index f73464a..b2c58c2 100644 --- a/modules_k/purple/utils.h +++ b/modules_k/purple/utils.h @@ -21,7 +21,7 @@ #define _UTILS_H #include <stdlib.h> - +#include <glib.h> #include <libpurple/savedstatuses.h> #include <libpurple/status.h>

2 2

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by admin＠sip-router.org 07 May '12

07 May '12

Module: sip-router Branch: master Commit: 54f6fa4ebbd079e52e4d57f0cab9ebee2e276a0e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54f6fa4… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon May 7 11:57:38 2012 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

2 1

git:master: Bugfix: Ommit Username in uri, if AOR is empty.
by admin＠sip-router.org 07 May '12

07 May '12

Module: sip-router Branch: master Commit: 41e228e5a2166d796a2b52a6c2fea31603088a18 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=41e228e… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon May 7 11:56:03 2012 +0200 Bugfix: Ommit Username in uri, if AOR is empty. - Thanks to Gnaneshwar Gatla for reporting. --- modules_k/pua_reginfo/usrloc_cb.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules_k/pua_reginfo/usrloc_cb.c b/modules_k/pua_reginfo/usrloc_cb.c index addeea9..c2528ca 100644 --- a/modules_k/pua_reginfo/usrloc_cb.c +++ b/modules_k/pua_reginfo/usrloc_cb.c @@ -233,7 +233,10 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { LM_ERR("Error allocating memory for URI!\n"); goto error; } - uri.len = snprintf(uri.s, uri.len, "sip:%.*s@%.*s", record->aor.len, record->aor.s, default_domain.len, default_domain.s); + if (record->aor.len > 0) + uri.len = snprintf(uri.s, uri.len, "sip:%.*s@%.*s", record->aor.len, record->aor.s, default_domain.len, default_domain.s); + else + uri.len = snprintf(uri.s, uri.len, "sip:%.*s", default_domain.len, default_domain.s); } else { uri.len = record->aor.len + 6; uri.s = (char*)pkg_malloc(sizeof(char) * uri.len);

1 0

← Newer
1
...
11
12
13
14
15
16
17
18
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2012