Changeset 3690

Timestamp:

05/30/2012 07:05:22 PM (12 months ago)

Author:

kurtis.heimerl

Message:

New-style socketed CLI support. Hooray histories!

Location:

openbts/trunk/apps

Files:

• Makefile.am (modified) (2 diffs)
• OpenBTS.cpp (modified) (3 diffs)
• OpenBTS.example.sql (modified) (1 diff)
• OpenBTSCLI.cpp (added)
• OpenBTSDo.cpp (added)

openbts/trunk/apps/Makefile.am

@@ -26 +26 @@
 
 noinst_PROGRAMS = \
-        OpenBTS
+        OpenBTS \
+        OpenBTSDo \
+        OpenBTSCLI
 
 OpenBTS_SOURCES = OpenBTS.cpp
@@ -43 +45 @@
         $(ORTP_LIBS)
 
+OpenBTSCLI_SOURCES = OpenBTSCLI.cpp
+OpenBTSDo_SOURCES = OpenBTSDo.cpp
+OpenBTSCLI_LDADD = -lreadline -lncurses
+
 EXTRA_DIST = \
         OpenBTS.example.sql

openbts/trunk/apps/OpenBTS.cpp

@@ -58 +58 @@
 #include <string.h>
 #include <signal.h>
-
-#ifdef HAVE_LIBREADLINE // [
-//#  include <stdio.h>
-#  include <readline/readline.h>
-#  include <readline/history.h>
-#endif // HAVE_LIBREADLINE ]
 
 using namespace std;
@@ -139 +133 @@
 int main(int argc, char *argv[])
 {
+
+        int sock = socket(AF_UNIX,SOCK_DGRAM,0);
+        if (sock<0) {
+                perror("opening cmd datagram socket");
+                exit(1);
+        }
 
         try {
@@ -315 +315 @@
         gBTS.start();
 
-#ifdef HAVE_LIBREADLINE // [
-        // start console
-        using_history();
-
-        static const char * const history_file_name = "/.openbts_history";
-        char *history_name = 0;
-        char *home_dir = getenv("HOME");
-
-        if(home_dir) {
-                size_t home_dir_len = strlen(home_dir);
-                size_t history_file_len = strlen(history_file_name);
-                size_t history_len = home_dir_len + history_file_len + 1;
-                if(history_len > home_dir_len) {
-                        if(!(history_name = (char *)malloc(history_len))) {
-                                LOG(ERR) << "malloc failed: " << strerror(errno);
-                                exit(2);
-                        }
-                        memcpy(history_name, home_dir, home_dir_len);
-                        memcpy(history_name + home_dir_len, history_file_name,
-                           history_file_len + 1);
-                        read_history(history_name);
+
+        cout << "\nsystem ready\n";
+        cout << "\nuse the OpenBTSCLI utility to access CLI\n";
+        LOG(INFO) << "system ready";
+
+        struct sockaddr_un cmdSockName;
+        cmdSockName.sun_family = AF_UNIX;
+        const char* sockpath = gConfig.getStr("CLI.SocketPath","/var/run/OpenBTS/command").c_str();
+        char rmcmd[strlen(sockpath)+5];
+        sprintf(rmcmd,"rm %s",sockpath);
+        system(rmcmd);
+        strcpy(cmdSockName.sun_path,sockpath);
+        if (bind(sock, (struct sockaddr *) &cmdSockName, sizeof(struct sockaddr_un))) {
+                perror("binding name to cmd datagram socket");
+                exit(1);
+        }
+
+        while (1) {
+                char cmdbuf[1000];
+                struct sockaddr_un source;
+                socklen_t sourceSize = sizeof(source);
+                int nread = recvfrom(sock,cmdbuf,sizeof(cmdbuf)-1,0,(struct sockaddr*)&source,&sourceSize);
+                cmdbuf[nread]='\0';
+                LOG(INFO) << "received command \"" << cmdbuf << "\" from " << source.sun_path;
+                std::ostringstream sout;
+                int res = gParser.process(cmdbuf,sout);
+                const std::string rspString= sout.str();
+                const char* rsp = rspString.c_str();
+                LOG(INFO) << "sending " << strlen(rsp) << "-char result to " << source.sun_path;
+                if (sendto(sock,rsp,strlen(rsp)+1,0,(struct sockaddr*)&source,sourceSize)<0) {
+                        LOG(ERR) << "can't send CLI response to " << source.sun_path;
                 }
-        }
-#endif // HAVE_LIBREADLINE ]
-
-
-
-        LOG(INFO) << "system ready";
-        COUT("\n\nWelcome to OpenBTS.  Type \"help\" to see available commands.");
-        // FIXME: We want to catch control-d (emacs keybinding for exit())
-
-
-        // The logging parts were removed from this loop.
-        // If we want them back, they will need to go into their own thread.
-        while (1) {
-#ifdef HAVE_LIBREADLINE // [
-                char *inbuf = readline(gConfig.getStr("CLI.Prompt").c_str());
-                if (!inbuf) break;
-                if (*inbuf) {
-                        add_history(inbuf);
-                        // The parser returns -1 on exit.
-                        if (gParser.process(inbuf, cout, cin)<0) {
-                                free(inbuf);
-                                break;
-                        }
-                }
-                free(inbuf);
-#else // HAVE_LIBREADLINE ][
-                cout << endl << gConfig.getStr("CLI.Prompt");
-                cout.flush();
-                char inbuf[1024];
-                cin.getline(inbuf,1024,'\n');
-                // The parser returns -1 on exit.
-                if (gParser.process(inbuf,cout,cin)<0) break;
-#endif // !HAVE_LIBREADLINE ]
-        }
-
-#ifdef HAVE_LIBREADLINE // [
-        if(history_name) {
-                int e = write_history(history_name);
-                if(e) {
-                        fprintf(stderr, "error: history: %s\n", strerror(e));
-                }
-                free(history_name);
-                history_name = 0;
-        }
-#endif // HAVE_LIBREADLINE ]
+                // res<0 means to exit the application
+                if (res<0) break;
+        }
+
+        } // try
+
+        catch (ConfigurationTableKeyNotFound e) {
+                LOG(ALERT) << "required configuration key " << e.key() << " not defined, aborting";
+        }
 
         if (gTransceiverPid) kill(gTransceiverPid, SIGKILL);
-
-
-        }
-
-        catch (ConfigurationTableKeyNotFound e) {
-
-                LOG(ALERT) << "configuration key " << e.key() << " not defined";
-                exit(2);
-        }
+        close(sock);
 
 }

openbts/trunk/apps/OpenBTS.example.sql

@@ -2 +2 @@
 BEGIN TRANSACTION;
 CREATE TABLE CONFIG ( KEYSTRING TEXT UNIQUE NOT NULL, VALUESTRING TEXT, STATIC INTEGER DEFAULT 0, OPTIONAL INTEGER DEFAULT 0, COMMENTS TEXT DEFAULT '');
-INSERT INTO "CONFIG" VALUES('CLI.Prompt','OpenBTS> ',0,0,'Prompt for the OpenBTS command line interface.');
+INSERT INTO "CONFIG" VALUES('CLI.SocketPath','/var/run/command',0,0,'Path for Unix domain datagram socket used for the OpenBTS console interface.');
 INSERT INTO "CONFIG" VALUES('Control.Reporting.PhysStatusTable','/var/run/OpenBTSChannelTable.db',1,0,'File path for channel status reporting database.  Static.');
 INSERT INTO "CONFIG" VALUES('Control.Reporting.TMSITable','/var/run/OpenBTSTMSITable.db',1,0,'File path for TMSITable database.  Static.');