little improvements

diff --git a/ChangeLog b/ChangeLog
index 14abf6f..43c409f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,12 @@
 0.6 - Giovanni Di Stasi <giovanni.distasi@unina.it>
-* More than a sliver allowed to use the UMTS interface (one at a time)
+
+* More than a sliver allowed to use the umts interface (one at a time)
+* Removed init.umts at startup - gcom is called when "umts start" is issued
 
 0.4 - Giovanni Di Stasi <giovanni.distasi@unina.it>
 
 * Destinations added with "umts add ..." affect only the umts sliver
 * Added an iproute2 table (umts_table)
 * Implemented a better umts device discovery mechanism (using udev)
-* Added a check on the ip address provided by the user
+* Added a security check on the ip addresses provided by the user
 

diff --git a/README.User b/README.User
index dfbc7d6..c494f26 100644 (file)
--- a/README.User
+++ b/README.User
@@ -1,5 +1,5 @@
 ========================================================================
-3G-UMTS-TOOLS
+PLANETLAB-UMTS-TOOLS
 ========================================================================
 
 These tools give to users of a sliver the possibility to control a PPP

diff --git a/TODO b/TODO
index 0849844..5a4ec0a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,2 +1,4 @@
-0.6
-* Support more providers
+0.7
+* Do not call conn_off when umts start fails
+* Better error handling
+

diff --git a/frontend/Makefile b/frontend/Makefile
index 056bc2c..12838bd 100644 (file)
--- a/frontend/Makefile
+++ b/frontend/Makefile
@@ -1,6 +1,6 @@
 all: umts
 
-umts: umts.c umts.h
+umts: umts.c
        gcc -g umts.c -o umts
 
 clean:

diff --git a/frontend/umts.c b/frontend/umts.c
index 3f32877..2b866bc 100644 (file)
--- a/frontend/umts.c
+++ b/frontend/umts.c
@@ -25,8 +25,6 @@
 #include <errno.h>
 
 
-#include "umts.h"
-
 // vsys frontend
 
 //#define DEBUG

diff --git a/frontend/umts.h b/frontend/umts.h
deleted file mode 100644 (file)
index e33377e..0000000
--- a/frontend/umts.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//#define DEBUG
-
-const char * ok="OK\n";
-const char * fail="Failed\n";
-
-const char * connected="Connected\n";
-const char * disconnected="Disconnected\n";
-const char * wrong_cmd="Wrong command\n";

diff --git a/umts.init b/umts.init
deleted file mode 100755 (executable)
index 641b001..0000000
--- a/umts.init
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# chkconfig: - 87 30
-# description: Loads modules needed for the umts connection and uses gcom
-
-. /usr/lib/umts_functions
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-case "$1" in
-    start)
-       echo "Initializing the umts component..."
-       if init_umts; then echo "Done."; fi
-    ;;
-
-    *)
-       echo "usage: $0 start"
-    ;;
-
-esac
-
-exit 0
-

diff --git a/umtsd b/umtsd
index 780fb56..a97bf57 100755 (executable)
--- a/umtsd
+++ b/umtsd
@@ -21,15 +21,6 @@ command=`echo ${line%% *}`
 rest=`echo ${line#* }`
 
 case "$command" in
-    #init)
-       #logger "Initialitation of the UMTS inteface requested by $sliver"
-       #init_umts $sliver;
-       #
-       #if [[ $? != 0 ]] ; then
-       #       echo "Failed"
-       #fi
-    #;;
-
     start)
        logger "Starting the umts connection for $sliver"
        start_umts $sliver;
@@ -97,7 +88,7 @@ case "$command" in
 esac
 
 
-#sleep 1
+sleep 1
 echo "EOF"