Merge remote-tracking branch 'upstream/master'

Author: Lukasz Baj

CMakeLists.txt

@@ -96,7 +96,7 @@ endif()
 if (GPS_NSB)
     set(SOURCE ${SOURCE}
         metadata_input_gps_nsb.c)
-    add_definitions("-DNSB_GPS")
+    add_definitions("-DGPS_NSB_SUPPORT")
 endif()
 
 set(CPACK_GENERATOR "DEB")

metadata_exporter.c

@@ -53,7 +53,7 @@
 #ifdef SYSEVENT_SUPPORT
     #include "metadata_input_sysevent.h"
 #endif
-#ifdef NSB_GPS
+#ifdef GPS_NSB_SUPPORT
     #include "metadata_input_gps_nsb.h"
 #endif
 #include "metadata_input_netlink.h"
@@ -670,8 +670,8 @@ static void print_usage()
 #ifdef MUNIN_SUPPORT
     md_munin_usage();
 #endif
-#ifdef NSB_GPS_SUPPORT
-    md_nsp_gps_usage();
+#ifdef GPS_NSB_SUPPORT
+    md_gps_nsb_usage();
 #endif
 #ifdef SYSEVENT_SUPPORT
     md_sysevent_usage();
@@ -773,7 +773,7 @@ int main(int argc, char *argv[])
             md_netlink_setup(mde, (struct md_input_netlink*) mde->md_inputs[MD_INPUT_NETLINK]);
             num_inputs++;
         }
-#ifdef NSB_GPS
+#ifdef GPS_NSB_SUPPORT
         else if (!strcmp(key, "gps_nsb")) {
             mde->md_inputs[MD_INPUT_GPS_NSB] = calloc(sizeof(struct md_input_gps_nsb), 1);
 

metadata_input_gps_nsb.c

@@ -32,6 +32,7 @@
 #include <sys/socket.h>
 #include <netdb.h>
 #include <sys/time.h>
+#include <unistd.h>
 
 #include "backend_event_loop.h"
 #include "metadata_exporter.h"
@@ -48,10 +49,22 @@ static void md_input_gps_nsb_handle_event(void *ptr, int32_t fd, uint32_t events
     struct minmea_sentence_rmc rmc;
     int32_t retval;
 
-    retval = recv(fd, rcv_buf, sizeof(rcv_buf), 0);
+    if (!mign->sockfd)
+        return;
+
+    retval = recv(mign->sockfd, rcv_buf, sizeof(rcv_buf), 0);
+
+    if (retval <= 0) {
+        if (mign->sockfd) {
+            META_PRINT_SYSLOG(mign->parent, LOG_ERR, "NSB GPS error\n");
+            close(mign->sockfd);
+            mign->sockfd = 0;
+            mde_start_timer(mign->parent->event_loop, mign->sock_timeout_handle,
+                    MD_GPS_NSB_SOCK_INTVL);
+        }
 
-    if (retval <= 0)
         return;
+    }
 
     sentence_id = minmea_sentence_id(rcv_buf, 0);
 
@@ -93,9 +106,7 @@ static void md_input_gps_nsb_handle_event(void *ptr, int32_t fd, uint32_t events
     mde_publish_event_obj(mign->parent, (struct md_event *) &gps_event);
 }
 
-static uint8_t md_input_gps_nsb_config(struct md_input_gps_nsb *mign,
-                                       const char *address,
-                                       const char *port)
+static uint8_t md_input_gps_nsb_create_socket(struct md_input_gps_nsb *mign)
 {
     int32_t sockfd = -1;
     struct addrinfo hints, *res;
@@ -105,7 +116,7 @@ static uint8_t md_input_gps_nsb_config(struct md_input_gps_nsb *mign,
     hints.ai_socktype = SOCK_DGRAM;
     hints.ai_protocol = IPPROTO_UDP;
 
-    if (getaddrinfo(address, port, &hints, &res)) {
+    if (getaddrinfo(mign->addr, mign->port, &hints, &res)) {
         META_PRINT_SYSLOG(mign->parent, LOG_ERR, "Could not get address info for NSB GPS\n");
         return RETVAL_FAILURE;
     }
@@ -122,17 +133,44 @@ static uint8_t md_input_gps_nsb_config(struct md_input_gps_nsb *mign,
         return RETVAL_FAILURE;
     }
 
-    if(!(mign->event_handle = backend_create_epoll_handle(mign,
-                    sockfd, md_input_gps_nsb_handle_event)))
-        return RETVAL_FAILURE;
+    if (!(mign->event_handle)) {
+        if(!(mign->event_handle = backend_create_epoll_handle(mign,
+                        sockfd, md_input_gps_nsb_handle_event)))
+            return RETVAL_FAILURE;
+    }
 
     backend_event_loop_update(mign->parent->event_loop, EPOLLIN, EPOLL_CTL_ADD,
         sockfd, mign->event_handle);
 
+    mign->sockfd = sockfd;
     META_PRINT_SYSLOG(mign->parent, LOG_INFO, "NSB GPS socket %d\n", sockfd);
     return RETVAL_SUCCESS;
 }
 
+static void md_input_gps_nsb_sock_timeout(void *ptr)
+{
+    struct md_input_gps_nsb *mign = ptr;
+
+    if (md_input_gps_nsb_create_socket(mign) == RETVAL_FAILURE) {
+        mign->sock_timeout_handle->intvl = MD_GPS_NSB_SOCK_INTVL;
+    } else {
+        mign->sock_timeout_handle->intvl = 0;
+    }
+}
+
+static uint8_t md_input_gps_nsb_config(struct md_input_gps_nsb *mign,
+                                       const char *address,
+                                       const char *port)
+{
+    //call create_socket
+    if (md_input_gps_nsb_create_socket(mign) == RETVAL_FAILURE) {
+        mde_start_timer(mign->parent->event_loop, mign->sock_timeout_handle,
+                MD_GPS_NSB_SOCK_INTVL);
+    }
+
+    return RETVAL_SUCCESS;
+}
+
 static uint8_t md_input_gps_nsb_init(void *ptr, json_object* config)
 {
     struct md_input_gps_nsb *mign = ptr;
@@ -153,12 +191,28 @@ static uint8_t md_input_gps_nsb_init(void *ptr, json_object* config)
         return RETVAL_FAILURE;
     }
 
+    if (strlen(address) > (sizeof(mign->addr) - 1) ||
+        strlen(port) > (sizeof(mign->port) - 1)) {
+        META_PRINT_SYSLOG(mign->parent, LOG_ERR, "NSB GPS argument too long\n");
+        return RETVAL_FAILURE;
+    }
+
+    memcpy(mign->addr, address, strlen(address));
+    memcpy(mign->port, port, strlen(port));
+
+    if(!(mign->sock_timeout_handle = backend_event_loop_create_timeout(0,
+                    md_input_gps_nsb_sock_timeout, mign, 0))) {
+        META_PRINT_SYSLOG(mign->parent, LOG_ERR, "Failed to create NSB "
+                "timer\n");
+        return RETVAL_FAILURE;
+    }
+
     return md_input_gps_nsb_config(mign, address, port);
 }
 
 void md_gps_nsb_usage()
 {
-    fprintf(stderr, "\"nsp_gps\": {\t\tNSB GPS input\n");
+    fprintf(stderr, "\"gps_nsb\": {\t\tNSB GPS input\n");
     fprintf(stderr, "  \"address\":\t\tIP NSB broadcasts GPS to\n");
     fprintf(stderr, "  \"port\":\t\tPort NSB broadcasts GPS to\n");
     fprintf(stderr, "},\n");

metadata_input_gps_nsb.h

@@ -29,11 +29,20 @@
 
 #include "metadata_exporter.h"
 
+#define MD_GPS_NSB_SOCK_INTVL   1000
+
 struct backend_epoll_handle;
 
 struct md_input_gps_nsb {
     MD_INPUT;
     struct backend_epoll_handle *event_handle;
+    struct backend_timeout_handle *sock_timeout_handle;
+    uint32_t sockfd;
+
+    //46 is INET6_ADDRSTRLEN accoding to POSIX, but it does not make sense to
+    //include header here
+    char addr[46];
+    char port[6];
 };
 
 void md_gps_nsb_usage();

metadata_writer_zeromq.h

@@ -31,7 +31,7 @@
 #include "metadata_exporter.h"
 
 #define MD_ZMQ_BIND_INTVL   1000
-#define MD_ZMQ_DATA_VERSION 1
+#define MD_ZMQ_DATA_VERSION 3
 
 enum md_zmq_topics {
     MD_ZMQ_TOPIC_SYSEVENT,

metadata_writer_zeromq_monroe.c

@@ -113,5 +113,5 @@ const char *monroe_keys[MD_ZMQ_KEYS_MAX + 1] = {
     "ChannelMode1",
     "ChannelMode2",
 
-    "InternalInterfaceName"
+    "InternalInterface"
 };