Cleanup from John Hay (ntpsim).

bk: 3d33844fteq5fMWmbp3KoehxNM6xUA

diff --git a/include/ntpsim.h b/include/ntpsim.h
index e174022624c00011be10059426d6addb0f18e9e0..c8b839e1b4a70d67be2620eb9c855f9d46407ebc 100644 (file)
--- a/include/ntpsim.h
+++ b/include/ntpsim.h
@@ -82,7 +82,8 @@ void ndbeep(Node *, Event);
 void ndeclk(Node *, Event);
 void ntptmr(Node *, Event);
 void netpkt(Node *, Event);
-int srvr_rply(Node *, struct sockaddr_in *, struct interface *, struct pkt *);
+int srvr_rply(Node *, struct sockaddr_storage *, struct interface *,
+    struct pkt *);
 double guassian(double, double);
 int node_clock(Node *, double);
 int node_gettime(Node *, struct timeval *);

diff --git a/ntpd/ntpsim.c b/ntpd/ntpsim.c
index 6a4c5eb4179b19cec36cd8dbef7e37ef0e99ea50..f319dd7b52d2f2664151cc305cd391c7ca73d120 100644 (file)
--- a/ntpd/ntpsim.c
+++ b/ntpd/ntpsim.c
@@ -195,7 +195,7 @@ void netpkt(Node *n, Event e)
 }
 
 /* simulates a reply from server - called from sendpkt in ntp_io.c*/
-int srvr_rply(Node *n, struct sockaddr_in *dest,
+int srvr_rply(Node *n, struct sockaddr_storage *dest,
                struct interface *inter, struct pkt *rpkt)
 {
        double  srvr_time = (guassian(n->time*1e6, n->snse))/1e6;
@@ -246,10 +246,10 @@ int srvr_rply(Node *n, struct sockaddr_in *dest,
         get_systime(&(rbuf.recv_time));
         rbuf.recv_length = LEN_PKT_NOMAC;
         rbuf.recv_pkt = xpkt;
-        memcpy(&rbuf.srcadr, dest, sizeof(struct sockaddr_in));
-        memcpy(&rbuf.recv_srcadr, dest, sizeof(struct sockaddr_in));
+        memcpy(&rbuf.srcadr, dest, sizeof(struct sockaddr_storage));
+        memcpy(&rbuf.recv_srcadr, dest, sizeof(struct sockaddr_storage));
         if((rbuf.dstadr =
-                (struct interface *)malloc(sizeof(struct interface)))==NULL)
+            (struct interface *)malloc(sizeof(struct interface))) == NULL)
                 abortsim("server-malloc");
         memcpy(rbuf.dstadr, inter, sizeof(struct interface));
         rbuf.next = (struct recvbuf *)0;