Moved main() function to a new file to make unit testing easier.

bk: 4c56b7fcNwjpKW8QRAbfxvMetI3JjA

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index ad55a55d25b97684c6e659c96952abe7dd8525b0..58547af8d4b9a18311f39aa75395b7929b902e94 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -39,8 +39,10 @@ sntp_SOURCES =               \
        log.c           \
        log.h           \
        main.c          \
+       main.h          \
        networking.c    \
        networking.h    \
+       sntp.c          \
        sntp-opts.c     \
        sntp-opts.h     \
        utilities.c     \

diff --git a/sntp/main.c b/sntp/main.c
index 5793910691d33b61491d0ccf9c8bd97604dc23d0..3018d488f32b38526689525cf7abb04e62dcc1a0 100644 (file)
--- a/sntp/main.c
+++ b/sntp/main.c
@@ -1,14 +1,4 @@
-#include <config.h>
-#include <l_stdlib.h>
-#include <ntp_fp.h>
-#include <ntp.h>
-#include <ntp_stdlib.h>
-#include <ntp_unixtime.h>
-#include <isc/result.h>
-#include <isc/net.h>
-#include <stdio.h>
-
-#include <sntp-opts.h>
+#include "main.h"
 
 #include "crypto.h"
 #include "kod_management.h"
@@ -23,21 +13,6 @@ volatile int debug;
 
 struct key *keys = NULL;
 
-void set_li_vn_mode (struct pkt *spkt, char leap, char version, char mode); 
-int sntp_main (int argc, char **argv);
-int on_wire (struct addrinfo *host, struct addrinfo *bcastaddr);
-int set_time (double offset);
-
-
-int 
-main (
-       int argc,
-       char **argv
-       ) 
-{
-       return sntp_main(argc, argv);
-}
-
 /*
  * The actual main function.
  */

diff --git a/sntp/main.h b/sntp/main.h
new file mode 100644 (file)
index 0000000..6dc32f6
--- /dev/null
+++ b/sntp/main.h
@@ -0,0 +1,21 @@
+#ifndef SNTP_MAIN_H
+#define SNTP_MAIN_H
+
+#include <config.h>
+#include <l_stdlib.h>
+#include <ntp_fp.h>
+#include <ntp.h>
+#include <ntp_stdlib.h>
+#include <ntp_unixtime.h>
+#include <isc/result.h>
+#include <isc/net.h>
+#include <stdio.h>
+
+#include <sntp-opts.h>
+
+void set_li_vn_mode (struct pkt *spkt, char leap, char version, char mode); 
+int sntp_main (int argc, char **argv);
+int on_wire (struct addrinfo *host, struct addrinfo *bcastaddr);
+int set_time (double offset);
+
+#endif /* SNTP_MAIN_H */

diff --git a/sntp/sntp.c b/sntp/sntp.c
new file mode 100644 (file)
index 0000000..56c80f3
--- /dev/null
+++ b/sntp/sntp.c
@@ -0,0 +1,10 @@
+#include "main.h"
+
+int 
+main (
+       int argc,
+       char **argv
+       ) 
+{
+       return sntp_main(argc, argv);
+}