o Fix bug with first try failing with IPC (was invalid length

initialization to recvfrom).

o Update lispmanager a bit for just using lispd with no module.
o Add retries to lispconf and timeouts so it won't hang.

Author: chris

lispd_tuntap/lispconf/lispconf.c

@@ -49,13 +49,27 @@ int send_command(lisp_cmd_t *cmd, int length)
 {
 
     int retval;
-
-    printf("Cmd: 0x%x, cmd->length: %d", cmd, cmd->length);
-    if ((retval = sendto(dsock_fd, cmd, sizeof(lisp_cmd_t) + cmd->length,  0,
-                         (struct sockaddr*)&server_sock, sizeof(struct sockaddr_un)) < 0)) {
+    int retries = 2;
+    struct timeval tv;
+
+    tv.tv_sec = 1; /* 1 second timeout */
+    tv.tv_usec = 0;
+
+    setsockopt(dsock_fd, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, sizeof(struct timeval));
+    while (retries) {
+        if ((retval = sendto(dsock_fd, cmd, sizeof(lisp_cmd_t) + cmd->length,  0,
+                             (struct sockaddr*)&server_sock, sizeof(struct sockaddr_un)) < 0)) {
+            retries--;
+            printf("timeout error, retrying...");
+        } else {
+            break;
+        }
+    }
+    if (!retries) {
         printf("Failed to send message, errno %d (%s)", errno, strerror(errno));
         exit(-1);
     }
+
     return retval;
 }
 
@@ -262,6 +276,11 @@ int process_print_cache_responses(void)
     char *formatted_rloc = NULL;
     struct timeval uptime;
     struct timeval expiretime;
+    int retries = 2;
+    struct timeval tv;
+
+    tv.tv_sec = 1; /* 1 second timeout */
+    tv.tv_usec = 0;
 
     if (!cmd) {
         printf("Memory allocation failure\n");
@@ -270,15 +289,15 @@ int process_print_cache_responses(void)
 
     printf("LISP IP Mapping Cache\n\n");
 
+
+    setsockopt(dsock_fd, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(struct timeval));
     while (1) {
         if ((retval = recvfrom(dsock_fd, cmd, MAX_MSG_LENGTH, 0, (struct sockaddr *)&server_sock,
                                &addr_len)) < 0) {
-            perror("recv");
             break;
         }
         if (!retval) {
-            printf("Peer closed connection.");
-            break;
+            return(errno);
         }
         map_msg = (lisp_cache_response_msg_t *)cmd->val;
         if (cmd->type == LispOk) {
@@ -602,6 +621,7 @@ int send_print_command(struct gengetopt_args_info *args_info)
     lisp_cmd_t        *cmd;
     int cmd_length = sizeof(lisp_cmd_t) + sizeof(lisp_lookup_msg_t);
     int retval;
+    int retries = 2;
     lisp_addr_t eid_prefix;
     int eid_prefix_len;
     int eid_af;
@@ -689,10 +709,21 @@ int send_print_command(struct gengetopt_args_info *args_info)
 
     retval = send_command(cmd, cmd_length);
 
-    if (cache) {
-        process_print_cache_responses();
-    } else {
-        process_print_db_responses();
+    while (retries) {
+        if (cache) {
+            retval = process_print_cache_responses();
+        } else {
+            retval = process_print_db_responses();
+        }
+        if (retval == ETIMEDOUT) {
+            retries--;
+            continue;
+        } else {
+            if (retval != 0) {
+                printf("Error waiting for response from lispd: %d", errno);
+            }
+            break;
+        }
     }
     return retval;
 }

lispd_tuntap/lispd_ipc.c

@@ -109,9 +109,7 @@ static void wait_for_completion()
 static void * handle_ipc_requests(void *arg)
 {
     struct sockaddr_un sock_addr;
-    socklen_t sock_len;
-    struct msghdr msg;
-    struct iovec  v;
+    socklen_t sock_len = sizeof(struct sockaddr_un);
     lisp_cmd_t *cmd = malloc(MaxIPCCommandLen);
 
     if (!cmd) {
@@ -269,7 +267,7 @@ int send_cache_lookup_response_msg(lisp_map_cache_t *entry)
     log_msg(INFO,  " Sending response.");
     err = send_message(cmd);
     if (err < 0)
-        log_msg(INFO,  " netlink_unicast() returned %d\n", err);
+        log_msg(INFO,  " send_message() returned %d\n", err);
     free(cmd);
     return 0;
 }

lispd_tuntap/lispmanager/lispmanager.c

@@ -27,7 +27,7 @@ const char *moduleRemoveCommand = "/system/bin/rmmod";
 const char *killCommand = "/system/bin/kill -15";
 const char *lockFilename = "/sdcard/lispd.lock";
 const char *moduleCheckFilename = "/proc/modules";
-const char *procCheckCommand = "/system/xbin/pgrep -l lispd";
+const char *procCheckCommand = "/system/xbin/pgrep -nl lispd";
 
 int startDaemon(void)
 {
@@ -70,30 +70,8 @@ int removeKernelMod(void)
 
 void getStatus(void)
 {
-    FILE *procModFile;
     FILE *procPipe;
     char  statusString[128];
-    char found = 0;
-    char status = 0;
-
-    procModFile = fopen(moduleCheckFilename, "r");
-
-    while (!feof(procModFile)) {
-        fread(statusString, 128, 1, procModFile);
-        if (strstr(statusString, "lisp")) {
-            printf("Kernel module: loaded.\n");
-            found = 1;
-        }
-    }
-
-    if (!found) {
-        printf("Kernel module: not loaded.\n");
-        printf("lispd: not running.\n");
-        status = 2;
-        exit(status);
-    }
-
-    found = 0;
 
     procPipe = popen(procCheckCommand, "r");
 
@@ -105,12 +83,11 @@ void getStatus(void)
     fgets(statusString, 128, procPipe);
     if (strstr(statusString, "lispd")) {
         printf("lispd: running.\n");
-        exit(status);
+        exit(0);
     }
 
     printf("lispd: not running.\n");
-    status = 1;
-    exit(status);
+    exit(1);
 }
 
 int main(int argc, char **argv)