/*
+ * $Id: zip.c,v 1.9 2002-01-03 17:49:39 sibaz Exp $
+ *
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
#include <stdlib.h>
#include <string.h>
+#include <errno.h>
#include <sys/param.h>
#include <sys/types.h>
-#include <sys/syslog.h>
+#include <syslog.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/time.h>
+#ifdef TRU64
+#include <sys/mbuf.h>
+#include <net/route.h>
+#endif /* TRU64 */
#include <net/if.h>
#include <net/route.h>
#include <netatalk/endian.h>
#ifdef __svr4__
#include <sys/sockio.h>
-#endif __svr4__
+#endif /* __svr4__ */
#include <atalk/ddp.h>
#include <atalk/zip.h>
if ( sendto( ap->ap_fd, packet, reply - packet, 0,
(struct sockaddr *)from,
sizeof( struct sockaddr_at )) < 0 ) {
- syslog( LOG_ERR, "zip reply sendto: %m" );
+ syslog( LOG_ERR, "zip reply sendto: %s",
+ strerror(errno) );
}
reply = packet + 3;
if ( sendto( ap->ap_fd, packet, reply - packet,
0, (struct sockaddr *)from,
sizeof( struct sockaddr_at )) < 0 ) {
- syslog( LOG_ERR, "zip reply sendto: %m" );
+ syslog( LOG_ERR, "zip reply sendto: %s",
+ strerror(errno) );
}
reply = packet + 3;
if ( sendto( ap->ap_fd, packet, reply - packet, 0,
(struct sockaddr *)from,
sizeof( struct sockaddr_at )) < 0 ) {
- syslog( LOG_ERR, "zip reply sendto: %m" );
+ syslog( LOG_ERR, "zip reply sendto: %s",
+ strerror(errno) );
}
reply = packet + 3;
if ( sendto( ap->ap_fd, packet, reply - packet, 0,
(struct sockaddr *)from,
sizeof( struct sockaddr_at )) < 0 ) {
- syslog( LOG_ERR, "zip reply sendto: %m" );
+ syslog( LOG_ERR, "zip reply sendto: %s",
+ strerror(errno) );
}
}
break;
if ( sendto( ap->ap_fd, packet, data - packet, 0,
(struct sockaddr *)from,
sizeof( struct sockaddr_at )) < 0 ) {
- syslog( LOG_ERR, "zip gni sendto %u.%u: %m",
- ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
+ syslog( LOG_ERR, "zip gni sendto %u.%u: %s",
+ ntohs( from->sat_addr.s_net ), from->sat_addr.s_node,
+ strerror(errno) );
return 1;
}
break;
/* add addr to loopback route */
if ( looproute( iface, RTMP_ADD )) { /* -1 or 1 */
syslog( LOG_ERR,
- "zip_packet: can't route %u.%u to loopback: %m",
+ "zip_packet: can't route %u.%u to loopback: %s",
ntohs( iface->i_addr.sat_addr.s_net ),
- iface->i_addr.sat_addr.s_node );
+ iface->i_addr.sat_addr.s_node,
+ strerror(errno) );
return -1;
}
#ifdef DEBUG
printf( "zip notify from %u.%u\n", ntohs( from->sat_addr.s_net ),
from->sat_addr.s_node );
-#endif DEBUG
+#endif /* DEBUG */
break;
default :
if ( sendto( ap->ap_fd, packet, data - packet, 0,
(struct sockaddr *)from,
sizeof( struct sockaddr_at )) < 0 ) {
- syslog( LOG_ERR, "zip atp sendto %u.%u: %m",
- ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
+ syslog( LOG_ERR, "zip atp sendto %u.%u: %s",
+ ntohs( from->sat_addr.s_net ), from->sat_addr.s_node,
+ strerror(errno) );
return 1;
}
}
#ifdef BSD4_4
sat.sat_len = sizeof( struct sockaddr_at );
-#endif BSD4_4
+#endif /* BSD4_4 */
sat.sat_family = AF_APPLETALK;
sat.sat_addr.s_net = 0;
sat.sat_addr.s_node = ATADDR_BCAST;
if ( sendto( ap->ap_fd, packet, data - packet, 0, (struct sockaddr *)&sat,
sizeof( struct sockaddr_at )) < 0 ) {
- syslog( LOG_ERR, "zip_getnetinfo sendto: %m" );
+ syslog( LOG_ERR, "zip_getnetinfo sendto: %s", strerror(errno) );
return -1;
}
return 0;
}
}
if (( l = (struct list *)malloc( sizeof( struct list ))) == NULL ) {
- syslog( LOG_ERR, "add_list malloc: %m" );
+ syslog( LOG_ERR, "add_list malloc: %s", strerror(errno) );
return -1;
}
}
if ( zt == NULL ) {
if (( zt = newzt( len, zone )) == NULL ) {
- syslog( LOG_ERR, "addzone newzt: %m" );
+ syslog( LOG_ERR, "addzone newzt: %s", strerror(errno) );
return -1;
}
if ( ziptab == NULL ) {