cleanups

bk: 488fa202VcFe6DqwliAlSYpb49HJaw

diff --git a/gsoc_sntp/configure.ac b/gsoc_sntp/configure.ac
index 007b9fe82f812a0452a6c4df4fd6b2f3bdc7a61e..eaf69fab0c63ccd362a123fedba3837e7640c3aa 100644 (file)
--- a/gsoc_sntp/configure.ac
+++ b/gsoc_sntp/configure.ac
@@ -79,7 +79,7 @@ AC_TYPE_UID_T
 AC_DEFINE(HAVE_NO_NICE, 1, [sntp does not care about 'nice'])
 AC_DEFINE(HAVE_TERMIOS, 1, [sntp does not care about TTY stuff])
 AC_DEFINE(ISC_PLATFORM_HAVEIPV6, 1, [hack])
- 
+AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1, [Does a system header define struct sockaddr_storage?]) 
 
 
 # Checks for library functions.

diff --git a/gsoc_sntp/header.h b/gsoc_sntp/header.h
index c752d15545db0aaf2be1b08ee31efaa90f0e7e8a..1a4b85dc05077a12fab130d191ec58cc8a35f07a 100644 (file)
--- a/gsoc_sntp/header.h
+++ b/gsoc_sntp/header.h
@@ -15,7 +15,6 @@ No changes should be needed for any system that is even remotely like Unix. */
 
 
 
-#define VERSION         "1.6"          /* Just the version string */
 #define MAX_SOCKETS        10          /* Maximum number of addresses */
 
 #ifndef LOCKNAME

diff --git a/gsoc_sntp/main.c b/gsoc_sntp/main.c
index 26d45023557168f87d53d324bb3f2a5840cd34b9..225a7f8cecc566f00ee1af824fd8cb45563f9862 100644 (file)
--- a/gsoc_sntp/main.c
+++ b/gsoc_sntp/main.c
@@ -1,18 +1,23 @@
-#include "networking.h"
-#include "header.h"
-
+#if 0
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
+#endif
 
-#include <getopt.h>
 #include <ntp_stdlib.h>
 
+#include <sntp-opts.h>
+
+#include "networking.h"
+#include "header.h"
+
 #define NTP_PORT 123
 
 int ai_fam_tmpl;
 
+volatile int debug;
+
 
 int 
 main (

diff --git a/gsoc_sntp/networking.h b/gsoc_sntp/networking.h
index 3c917139e7fcb0369eea5d30a704f537adaefeaa..bf034c94aaeae4010de8c4778a854ca81d9f76b1 100644 (file)
--- a/gsoc_sntp/networking.h
+++ b/gsoc_sntp/networking.h
@@ -12,6 +12,8 @@
 #include <strings.h>   /**/
 #include <errno.h>     /**/
 
+#include <ntp_stdlib.h>
+
 #include "data_formats.h"
 
 /* FIXME, see portability issue 1 */ /* irrelevant for now */
@@ -26,7 +28,6 @@
 /* Maximum number of sockets... should be specified in sntp.h later */
 #define MAX_AF 2
 
-
 int descriptors[MAX_AF];