From: Eric Leblond <eric@regit.org>
Date: Mon, 19 Nov 2012 10:49:04 +0000 (+0100)
Subject: unix-socket: fix build when jansson not present
X-Git-Tag: suricata-1.4rc1~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af16c418b753774b70e06cf0cc94ec7388c38611;p=thirdparty%2Fsuricata.git

unix-socket: fix build when jansson not present
---

diff --git a/src/runmode-unix-socket.c b/src/runmode-unix-socket.c
index 5f5020c7ce..d83ff932a2 100644
--- a/src/runmode-unix-socket.c
+++ b/src/runmode-unix-socket.c
@@ -60,15 +60,16 @@ typedef struct PcapCommand_ {
     int running;
 } PcapCommand;
 
-static int unix_manager_file_task_running = 0;
-static int unix_manager_file_task_failed = 0;
-
 const char *RunModeUnixSocketGetDefaultMode(void)
 {
     return default_mode;
 }
 
 #ifdef BUILD_UNIX_SOCKET
+
+static int unix_manager_file_task_running = 0;
+static int unix_manager_file_task_failed = 0;
+
 /**
  * \brief return list of files in the queue
  *
diff --git a/src/suricata.c b/src/suricata.c
index add3bccdf6..febe1b79c9 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -1944,9 +1944,11 @@ int main(int argc, char **argv)
             unix_socket = 0;
         if (unix_socket == 1) {
             UnixManagerThreadSpawn(de_ctx, 0);
+#ifdef BUILD_UNIX_SOCKET
             UnixManagerRegisterCommand("iface-stat", LiveDeviceIfaceStat, NULL,
                                        UNIX_CMD_TAKE_ARGS);
             UnixManagerRegisterCommand("iface-list", LiveDeviceIfaceList, NULL, 0);
+#endif
         }
         /* Spawn the flow manager thread */
         FlowManagerThreadSpawn();
diff --git a/src/unix-manager.c b/src/unix-manager.c
index ee94069fb0..44f3dc500d 100644
--- a/src/unix-manager.c
+++ b/src/unix-manager.c
@@ -831,19 +831,4 @@ void UnixSocketKillSocketThread(void)
     return;
 }
 
-TmEcode UnixManagerRegisterCommand(const char * keyword, 
-        TmEcode (*Func)(json_t *, json_t *, void *),
-        void *data, int flags)
-{
-    return TM_ECODE_OK;
-}
-
-TmEcode UnixManagerRegisterBackgroundTask( 
-        TmEcode (*Func)(void *),
-        void *data)
-{
-    return TM_ECODE_OK;
-}
-
-
 #endif /* BUILD_UNIX_SOCKET */
diff --git a/src/unix-manager.h b/src/unix-manager.h
index f224d2d32a..97145a59bf 100644
--- a/src/unix-manager.h
+++ b/src/unix-manager.h
@@ -37,11 +37,13 @@ void UnixManagerThreadSpawn(DetectEngineCtx *de_ctx, int mode);
 void UnixSocketKillSocketThread(void);
 
 
-TmEcode UnixManagerRegisterCommand(const char * keyword, 
+#ifdef BUILD_UNIX_SOCKET
+TmEcode UnixManagerRegisterCommand(const char * keyword,
         TmEcode (*Func)(json_t *, json_t *, void *),
         void *data, int flags);
-TmEcode UnixManagerRegisterBackgroundTask( 
+TmEcode UnixManagerRegisterBackgroundTask(
         TmEcode (*Func)(void *),
         void *data);
+#endif
 
 #endif /* UNIX_MANAGER_H */
diff --git a/src/util-device.c b/src/util-device.c
index f5c3bd4b2f..e43253c22a 100644
--- a/src/util-device.c
+++ b/src/util-device.c
@@ -153,11 +153,10 @@ int LiveBuildDeviceList(char * runmode)
     return i;
 }
 
-
+#ifdef BUILD_UNIX_SOCKET
 TmEcode LiveDeviceIfaceStat(json_t *cmd, json_t *answer, void *data)
 {
     SCEnter();
-#ifdef BUILD_UNIX_SOCKET
     LiveDevice *pd;
     const char * name = NULL;
     json_t *jarg = json_object_get(cmd, "iface");
@@ -190,14 +189,12 @@ TmEcode LiveDeviceIfaceStat(json_t *cmd, json_t *answer, void *data)
         }
     }
     json_object_set_new(answer, "message", json_string("Iface does not exist"));
-#endif /* BUILD_UNIX_SOCKET */
     SCReturn(TM_ECODE_FAILED);
 }
 
 TmEcode LiveDeviceIfaceList(json_t *cmd, json_t *answer, void *data)
 {
     SCEnter();
-#ifdef BUILD_UNIX_SOCKET
     json_t *jdata;
     json_t *jarray;
     LiveDevice *pd;
@@ -224,7 +221,5 @@ TmEcode LiveDeviceIfaceList(json_t *cmd, json_t *answer, void *data)
     json_object_set_new(jdata, "ifaces", jarray);
     json_object_set_new(answer, "message", jdata);
     SCReturn(TM_ECODE_OK);
-#else /* BUILD_UNIX_SOCKET */
-    SCReturn(TM_ECODE_FAILED);
-#endif /* BUILD_UNIX_SOCKET */
 }
+#endif /* BUILD_UNIX_SOCKET */
diff --git a/src/util-device.h b/src/util-device.h
index 262ba0691b..55aff3ca08 100644
--- a/src/util-device.h
+++ b/src/util-device.h
@@ -38,7 +38,9 @@ char *LiveGetDeviceName(int number);
 LiveDevice *LiveGetDevice(char *dev);
 int LiveBuildDeviceList(char * base);
 
+#ifdef BUILD_UNIX_SOCKET
 TmEcode LiveDeviceIfaceStat(json_t *cmd, json_t *server_msg, void *data);
 TmEcode LiveDeviceIfaceList(json_t *cmd, json_t *server_msg, void *data);
+#endif
 
 #endif /* __UTIL_DEVICE_H__ */