replaced all #include <sys/syslog.h> with #include <syslog.h>

[netatalk.git] / etc / atalkd / nbp.c

diff --git a/etc/atalkd/nbp.c b/etc/atalkd/nbp.c
index cdd4cec4e8f68d724faba7ea88c021d4e82e366c..7853c0449060f80300bb1c53376f200375a75443 100644 (file)
--- a/etc/atalkd/nbp.c
+++ b/etc/atalkd/nbp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nbp.c,v 1.3 2001-06-25 20:13:45 rufustfirefly Exp $
+ * $Id: nbp.c,v 1.7 2002-01-03 17:49:39 sibaz Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -11,11 +11,16 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <sys/syslog.h>
+#include <errno.h>
+#include <syslog.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#ifdef TRU64
+#include <sys/mbuf.h>
+#include <net/route.h>
+#endif /* TRU64 */
 #include <net/if.h>
 #include <netatalk/at.h>
 #include <atalk/ddp.h>
@@ -55,11 +60,11 @@ void nbp_ack( fd, nh_op, nh_id, to )
     nh.nh_id = nh_id;
     data = packet;
     *data++ = DDPTYPE_NBP;
-    bcopy( &nh, data, SZ_NBPHDR );
+    memcpy( data, &nh, SZ_NBPHDR );
     data += SZ_NBPHDR;
     if ( sendto( fd, packet, data - packet, 0, (struct sockaddr *)to,
            sizeof( struct sockaddr_at )) < 0 ) {
-       syslog( LOG_ERR, "sendto: %m" );
+       syslog( LOG_ERR, "sendto: %s", strerror(errno) );
     }
 }
 
@@ -213,7 +218,8 @@ int nbp_packet( ap, from, data, len )
                    if ( zt == (struct ziptab *)l->l_data ) {
                        /* add multicast */
                        if (addmulti(iface->i_name, zt->zt_bcast) < 0) {
-                           syslog( LOG_ERR, "nbp_packet: addmulti: %m" );
+                           syslog( LOG_ERR, "nbp_packet: addmulti: %s",
+                                   strerror(errno) );
                            return -1;
                        }
                    }
@@ -223,7 +229,7 @@ int nbp_packet( ap, from, data, len )
 
        if (( ntab = (struct nbptab *)malloc( sizeof( struct nbptab )))
                == 0 ) {
-           syslog( LOG_ERR, "nbp_packet: malloc: %m" );
+           syslog( LOG_ERR, "nbp_packet: malloc: %s", strerror(errno) );
            return -1;
        }
        memcpy( &ntab->nt_nve, &nn, sizeof( struct nbpnve ));
@@ -398,7 +404,7 @@ int nbp_packet( ap, from, data, len )
 
            if ( sendto( ap->ap_fd, data - len, len, 0, (struct sockaddr *)&sat,
                    sizeof( struct sockaddr_at )) < 0 ) {
-               syslog( LOG_ERR, "nbp brrq sendto: %m" );
+               syslog( LOG_ERR, "nbp brrq sendto: %s", strerror(errno) );
            }
 
            locallkup = 1;
@@ -443,19 +449,19 @@ Can't find route's interface!" );
                        locallkup = 1;
                    }
                    nh.nh_op = NBPOP_LKUP;
-                   bcopy( &nh, nbpop, SZ_NBPHDR );
+                   memcpy( nbpop, &nh, SZ_NBPHDR );
                    sat.sat_addr.s_net = rtmp->rt_firstnet;
                    sat.sat_addr.s_node = ATADDR_BCAST;
                } else {
                    if ( rtmp->rt_gate == 0 ) {
                        nh.nh_op = NBPOP_LKUP;
-                       bcopy( &nh, nbpop, SZ_NBPHDR );
+                       memcpy( nbpop, &nh, SZ_NBPHDR );
                        sat.sat_addr.s_net = 0;
                        sat.sat_addr.s_node = ATADDR_BCAST;
                        locallkup = 1;
                    } else {
                        nh.nh_op = NBPOP_FWD;
-                       bcopy( &nh, nbpop, SZ_NBPHDR );
+                       memcpy( nbpop, &nh, SZ_NBPHDR );
                        sat.sat_addr.s_net = rtmp->rt_firstnet;
                        sat.sat_addr.s_node = 0;
                    }
@@ -464,8 +470,9 @@ Can't find route's interface!" );
                if ( sendto( ap->ap_fd, data - len, len, 0,
                        (struct sockaddr *)&sat,
                        sizeof( struct sockaddr_at )) < 0 ) {
-                   syslog( LOG_ERR, "nbp brrq sendto %u.%u: %m",
-                           ntohs( sat.sat_addr.s_net ), sat.sat_addr.s_node );
+                   syslog( LOG_ERR, "nbp brrq sendto %u.%u: %s",
+                           ntohs( sat.sat_addr.s_net ), sat.sat_addr.s_node,
+                           strerror(errno) );
                    continue;
                }
            }
@@ -480,13 +487,14 @@ Can't find route's interface!" );
         /* send lkup on net. we need to make sure we're a router. */
         if ( !locallkup && (ap->ap_iface->i_flags & IFACE_ISROUTER)) {
            nh.nh_op = NBPOP_LKUP;
-           bcopy( &nh, nbpop, SZ_NBPHDR );
+           memcpy( nbpop, &nh, SZ_NBPHDR );
            from->sat_addr.s_net = 0;
            from->sat_addr.s_node = ATADDR_BCAST;
            if ( sendto( ap->ap_fd, data - len, len, 0, (struct sockaddr *)from,
                    sizeof( struct sockaddr_at )) < 0 ) {
-               syslog( LOG_ERR, "nbp fwd sendto %u.%u: %m",
-                       ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
+               syslog( LOG_ERR, "nbp fwd sendto %u.%u: %s",
+                       ntohs( from->sat_addr.s_net ), from->sat_addr.s_node,
+                       strerror(errno) );
                return 0;
            }
        }
@@ -555,14 +563,15 @@ Can't find route's interface!" );
                cc = data - packet;
                data = packet;
                *data++ = DDPTYPE_NBP;
-               bcopy( &nh, data, SZ_NBPHDR );
+               memcpy( data, &nh, SZ_NBPHDR );
 
                if ( sendto( ap->ap_fd, packet, cc, 0,
                        (struct sockaddr *)&nn.nn_sat,
                        sizeof( struct sockaddr_at )) < 0 ) {
-                   syslog( LOG_ERR, "nbp lkup sendto %u.%u: %m",
+                   syslog( LOG_ERR, "nbp lkup sendto %u.%u: %s",
                            ntohs( nn.nn_sat.sat_addr.s_net ),
-                           nn.nn_sat.sat_addr.s_node );
+                           nn.nn_sat.sat_addr.s_node,
+                           strerror(errno) );
                    return 0;
                }
 
@@ -601,7 +610,7 @@ Can't find route's interface!" );
             */
            if ( ntab->nt_nve.nn_zonelen ) {
                *data++ = ntab->nt_nve.nn_zonelen;
-               bcopy( ntab->nt_nve.nn_zone, data, ntab->nt_nve.nn_zonelen );
+               memcpy( data, ntab->nt_nve.nn_zone, ntab->nt_nve.nn_zonelen );
                data += ntab->nt_nve.nn_zonelen;
            } else {
                *data++ = 1;
@@ -617,14 +626,15 @@ Can't find route's interface!" );
            cc = data - packet;
            data = packet;
            *data++ = DDPTYPE_NBP;
-           bcopy( &nh, data, SZ_NBPHDR );
+           memcpy( data, &nh, SZ_NBPHDR );
 
            if ( sendto( ap->ap_fd, packet, cc, 0,
                    (struct sockaddr *)&nn.nn_sat,
                    sizeof( struct sockaddr_at )) < 0 ) {
-               syslog( LOG_ERR, "nbp lkup sendto %u.%u: %m",
+               syslog( LOG_ERR, "nbp lkup sendto %u.%u: %s",
                        ntohs( nn.nn_sat.sat_addr.s_net ),
-                       nn.nn_sat.sat_addr.s_node );
+                       nn.nn_sat.sat_addr.s_node,
+                       strerror(errno) );
                return 0;
            }
        }