Changeset 3728

Timestamp:

06/05/2012 06:53:38 PM (12 months ago)

Author:

kurtis.heimerl

Message:

Fixed sendsms bug, needed to move to non-interactive version

Files:

• openbts/trunk/CLI/CLI.cpp (modified) (4 diffs)

openbts/trunk/CLI/CLI.cpp

@@ -283 +283 @@
 }
 
+int isIMSI(const char *imsi)
+{
+        int i = 0;
+
+        if (!imsi)
+                return 0;
+        if (strlen(imsi) != 15)
+                return 0;
+        
+        for (i = 0; i < strlen(imsi); i++) {
+                if (!isdigit(imsi[i]))
+                        return 0;
+        }
+
+        return 1;
+}
 
 /** Submit an SMS for delivery to an IMSI. */
 int sendsimple(int argc, char** argv, ostream& os)
 {
-        if (argc!=3) return BAD_NUM_ARGS;
-
-        os << "enter text to send: ";
-        char txtBuf[161];
-        cin.getline(txtBuf,160,'\n');
+        if (argc<4) return BAD_NUM_ARGS;
+
         char *IMSI = argv[1];
         char *srcAddr = argv[2];
+        string rest = "";
+        for (int i=3; i<argc; i++) rest = rest + argv[i] + " ";
+        const char *txtBuf = rest.c_str();
+
+        if (!isIMSI(IMSI)) {
+                os << "Invalid IMSI. Enter 15 digits only.";
+                return BAD_VALUE;
+        }
 
         static UDPSocket sock(0,"127.0.0.1",gConfig.getNum("SIP.Local.Port"));
@@ -312 +333 @@
         sock.write(buffer);
 
+        os << "message submitted for delivery" << endl;
 
 #if 0
@@ -326 +348 @@
 }
 
-
 /** Submit an SMS for delivery to an IMSI. */
 int sendsms(int argc, char** argv, ostream& os)
 {
-        if (argc!=3) return BAD_NUM_ARGS;
-
-        os << "enter text to send: ";
-        char txtBuf[161];
-        cin.getline(txtBuf,160,'\n');
+        if (argc<4) return BAD_NUM_ARGS;
+
         char *IMSI = argv[1];
         char *srcAddr = argv[2];
+        string rest = "";
+        for (int i=3; i<argc; i++) rest = rest + argv[i] + " ";
+        const char *txtBuf = rest.c_str();
+
+        if (!isIMSI(IMSI)) {
+                os << "Invalid IMSI. Enter 15 digits only.";
+                return BAD_VALUE;
+        }
 
         Control::TransactionEntry *transaction = new Control::TransactionEntry(
@@ -741 +767 @@
         addCommand("exit", exit_function, "[wait] -- exit the application, either immediately, or waiting for existing calls to clear with a timeout in seconds");
         addCommand("tmsis", tmsis, "[\"clear\"] or [\"dump\" filename] -- print/clear the TMSI table or dump it to a file.");
-        addCommand("sendsms", sendsms, "<IMSI> <src> -- send direct SMS to <IMSI>, addressed from <src>, after prompting.");
-        addCommand("sendsimple", sendsimple, "<IMSI> <src> -- send SMS to <IMSI> via SIP interface, addressed from <src>, after prompting.");
+        addCommand("sendsms", sendsms, "IMSI src# message... -- send direct SMS to IMSI, addressed from source number src#.");
+        addCommand("sendsimple", sendsimple, "IMSI src# message... -- send SMS to IMSI via SIP interface, addressed from source number src#.");
         //apparently non-function now -kurtis
         //addCommand("sendrrlp", sendrrlp, "<IMSI> <hexstring> -- send RRLP message <hexstring> to <IMSI>.");