diff options
-rw-r--r-- | debian/control | 6 | ||||
-rw-r--r-- | debian/osmo-cellmgr-stp.install | 1 | ||||
-rwxr-xr-x | debian/osmo-stp.init | 151 | ||||
-rw-r--r-- | debian/osmo-stp.install | 1 | ||||
-rwxr-xr-x | debian/rules | 2 | ||||
-rw-r--r-- | src/Makefile.am | 2 |
6 files changed, 157 insertions, 6 deletions
diff --git a/debian/control b/debian/control index f3b1e56..0e6e48b 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Proxy between E1 to IP -Package: osmo-cellmgr-stp +Package: osmo-stp Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Simple Signalling Transfer Point (STP) @@ -30,11 +30,11 @@ Priority: extra Depends: osmo-cellmgr-ng (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for cellmgr-ng -Package: osmo-cellmgr-stp-dbg +Package: osmo-stp-dbg Architecture: any Section: debug Priority: extra -Depends: osmo-cellmgr-stp (= ${binary:Version}), ${misc:Depends} +Depends: osmo-stp (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for the cellmgr STP Package: osmo-cellmgr-mgcp-mgw-dbg diff --git a/debian/osmo-cellmgr-stp.install b/debian/osmo-cellmgr-stp.install deleted file mode 100644 index 21496a9..0000000 --- a/debian/osmo-cellmgr-stp.install +++ /dev/null @@ -1 +0,0 @@ -usr/sbin/osmo_stp diff --git a/debian/osmo-stp.init b/debian/osmo-stp.init new file mode 100755 index 0000000..e3794a6 --- /dev/null +++ b/debian/osmo-stp.init @@ -0,0 +1,151 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: osmo-stp +# Required-Start: $network $local_fs +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Osmocom STP +# Description: A simple STP/Bridge for Sigtran +### END INIT INFO + +# Author: Harald Welte <laforge@gnumonks.org> + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +NAME=osmo-stp # Introduce the short server's name here +DESC="Osmocom STP" # Introduce a short description here +DAEMON=/usr/bin/$NAME # Introduce the server's location here +SCRIPTNAME=/etc/init.d/$NAME +CONFIG_FILE=/etc/osmocom/$NAME.cfg + +# Exit if the package is not installed +[ -x $DAEMON ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +. /lib/lsb/init-functions + +DAEMON_ARGS="-D -c $CONFIG_FILE" + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + return "$RETVAL" +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + start-stop-daemon --stop --signal 1 --quiet $PIDFILE --name $NAME + return 0 +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + #reload|force-reload) + # + # If do_reload() is not implemented then leave this commented out + # and leave 'force-reload' as an alias for 'restart'. + # + #log_daemon_msg "Reloading $DESC" "$NAME" + #do_reload + #log_end_msg $? + #;; + restart|force-reload) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + +: diff --git a/debian/osmo-stp.install b/debian/osmo-stp.install new file mode 100644 index 0000000..5c98961 --- /dev/null +++ b/debian/osmo-stp.install @@ -0,0 +1 @@ +usr/sbin/osmo-stp diff --git a/debian/rules b/debian/rules index 86ed10d..14e3029 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ export DEB_BUILD_HARDENING=1 override_dh_strip: dh_strip -posmo-cellmgr-ng --dbg-package=osmo-cellmgr-ng-dbg - dh_strip -posmo-cellmgr-stp --dbg-package=osmo-cellmgr-stp-dbg + dh_strip -posmo-stp --dbg-package=osmo-stp-dbg dh_strip -posmo-cellmgr-mgcp-mgw --dbg-package=osmo-cellmgr-mgcp-mgw-dbg override_dh_auto_configure: diff --git a/src/Makefile.am b/src/Makefile.am index 20585be..93d7a58 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOGSM_CFLAGS) \ $(NEXUSWARE_C7_CFLAGS) $(NEXUSWARE_UNIPORTE_CFLAGS) $(UNIPORTE) -sbin_PROGRAMS = cellmgr_ng osmo_stp mgcp_mgw +sbin_PROGRAMS = cellmgr_ng osmo-stp mgcp_mgw mgcp_mgw_SOURCES = mgcp_ss7.c mgcp_ss7_vty.c mgcp_hw.c thread.c debug.c \ mgcp/mgcp_protocol.c mgcp/mgcp_network.c mgcp/mgcp_vty.c \ |