new version

[rrq/rrqnet.git] / rrqnet.c

diff --git a/rrqnet.c b/rrqnet.c
index b06c3abe4ca9af32efe217bce0aab7f7369812df..69c363c0f9c30bf144a069520cf85270ea919a72 100644 (file)
--- a/rrqnet.c
+++ b/rrqnet.c
@@ -16,6 +16,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <linux/if.h>
 #include <linux/if_tun.h>
 #include <stddef.h>
@@ -954,7 +955,7 @@ static void sendpacket4(unsigned char *buf, int n,struct Remote *r) {
        .msg_controllen = CMSG_SPACE( sizeof( struct in_pktinfo ) ),
        .msg_flags = 0 // unused
     };
-    VERBOSE2OUT( "sendmsg ipv4 %lu from %s to %s\n",
+    VERBOSE2OUT( "sendmsg ipv4 %zu from %s to %s\n",
                 msg.msg_controllen,
                 inet_stoa( &r->laddr ),
                 inet_stoa( &r->uaddr ) );
@@ -1099,7 +1100,7 @@ static struct Interface *input_check(PacketItem *pi) {
     ssize_t len = pi->len;
     struct SockAddr *src = &pi->src;
 
-    VERBOSE2OUT( "RECV %ld bytes from %s\n", len, inet_stoa( src ) );
+    VERBOSE2OUT( "RECV %zd bytes from %s\n", len, inet_stoa( src ) );
     struct Remote *r = 0;
     struct timeval now = { 0 };
     if ( gettimeofday( &now, 0 ) ) {
@@ -1139,7 +1140,7 @@ static struct Interface *input_check(PacketItem *pi) {
        // Ignore short data, but maintain channel
        r->rec_when = now; // Update activity stamp touched remote
        if ( len > 0 ) {
-           VERBOSEOUT( "Ignoring %ld bytes from %s\n",
+           VERBOSEOUT( "Ignoring %zd bytes from %s\n",
                        len, inet_stoa( src ) );
        }
        return 0;
@@ -1205,12 +1206,12 @@ static struct Interface *input_check(PacketItem *pi) {
        // primary channel, or the time since the last packet for that
        // interface is less than RECENT_MICROS, with different limits
        // for broadcast and unicast.
-       int64_t dmac = DIFF_MICROS( &now, &x->rec_when);
+       uint64_t dmac = DIFF_MICROS( &now, &x->rec_when);
        if ( x->remote->spec == 0 || RECENT_MICROS( *buf & 1, dmac ) ) {
            if ( verbose >= 2 ) {
                fprintf(
                    stderr,
-                   "Dropped. MAC %s (%ld) from %s, should be %s\n",
+                   "Dropped. MAC %s (%"PRIu64") from %s, should be %s\n",
                    inet_mtoa( buf+6 ), dmac,
                    inet_stoa( src ), inet_stoa( &x->remote->uaddr ) );
            }
@@ -1295,7 +1296,7 @@ static void route_packet(PacketItem *pi) {
        if ( r->spec && ! is_uplink( r->spec ) &&
             DIFF_MICROS( &now, &r->rec_when ) > VERYOLD_MICROS ) {
            // remove old downlink connection
-           VERBOSEOUT( "Old remote discarded %s (%ld)\n",
+           VERBOSEOUT( "Old remote discarded %s (%"PRId64")\n",
                        inet_stoa( &r->uaddr ),
                        TIME_MICROS( &r->rec_when ) );
            // Removing a downlink might have threading implications
@@ -1806,11 +1807,13 @@ int main(int argc, char *argv[]) {
        pthread_create( &thread, 0, doreadTap, &tap_reader );
     }
 
-    if ( heart_rate == 0 ) {
-       // Start heartbeating to uplinks
-       for ( ;; ) {
+    // Start heartbeating to uplinks
+    for ( ;; ) {
+       if ( heart_rate != 0 ) {
            sleep( heart_rate );
            heartbeat( udp_fd );
+       } else {
+           sleep( 600 );
        }
     }
     return 0;