/*
- * $Id: aep.c,v 1.7 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: aep.c,v 1.8 2002-09-29 23:24:47 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
end = data + len;
if ( data + 2 > end || *data != DDPTYPE_AEP ||
*( data + 1 ) != AEPOP_REQUEST ) {
- LOG(log_info, logtype_default, "aep_packet malformed packet" );
+ LOG(log_info, logtype_atalkd, "aep_packet malformed packet" );
return 1;
}
*( data + 1 ) = AEPOP_REPLY;
if ( sendto( ap->ap_fd, data, len, 0, (struct sockaddr *)from,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "aep sendto: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "aep sendto: %s", strerror(errno) );
return 1;
}
/*
- * $Id: config.c,v 1.11 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: config.c,v 1.12 2002-09-29 23:24:47 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
/* check if old conf is writable */
if ( stat( path, &st ) == 0 ) {
if (( st.st_mode & S_IWUSR ) == 0 ) {
- LOG(log_info, logtype_default, "%s not writable, won't rewrite", path );
+ LOG(log_info, logtype_atalkd, "%s not writable, won't rewrite", path );
return( -1 );
}
mode = st.st_mode;
sprintf( newpath, "%.*s/%s", (int)(p - path), path, _PATH_ATALKDTMP );
}
if (( fd = open( newpath, O_WRONLY|O_CREAT|O_TRUNC, mode )) < 0 ) {
- LOG(log_error, logtype_default, "%s: %s", newpath, strerror(errno) );
+ LOG(log_error, logtype_atalkd, "%s: %s", newpath, strerror(errno) );
return( -1 );
}
if (( newconf = fdopen( fd, "w" )) == NULL ) {
- LOG(log_error, logtype_default, "fdreopen %s: %s", newpath, strerror(errno) );
+ LOG(log_error, logtype_atalkd, "fdreopen %s: %s", newpath, strerror(errno) );
return( -1 );
}
if (( conf = fopen( path, "r" )) == NULL && cf ) {
- LOG(log_error, logtype_default, "%s: %s", path, strerror(errno) );
+ LOG(log_error, logtype_atalkd, "%s: %s", path, strerror(errno) );
return( -1 );
}
while ( conf == NULL || fgets( line, sizeof( line ), conf ) != NULL ) {
if ( conf != NULL && ( argv = parseline( line )) == NULL ) {
if ( fputs( line, newconf ) == EOF ) {
- LOG(log_error, logtype_default, "fputs: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "fputs: %s", strerror(errno) );
return( -1 );
}
freeline( argv );
fclose( newconf );
if ( rename( newpath, path ) < 0 ) {
- LOG(log_error, logtype_default, "rename %s to %s: %s", newpath, path, strerror(errno) );
+ LOG(log_error, logtype_atalkd, "rename %s to %s: %s", newpath, path, strerror(errno) );
return( -1 );
}
return( 0 );
strcpy( device, "/dev/" );
strcat( device, iface->i_name );
if (( p = strpbrk( device, "0123456789" )) == NULL ) {
- LOG(log_error, logtype_default, "plumb: invalid device: %s", device );
+ LOG(log_error, logtype_atalkd, "plumb: invalid device: %s", device );
return -1;
}
ppa = atoi( p );
*p = '\0';
if (( fd = open( device, O_RDWR, 0 )) < 0 ) {
- LOG(log_error, logtype_default, "%s: %m", device );
+ LOG(log_error, logtype_atalkd, "%s: %m", device );
return -1;
}
if ( ioctl( fd, I_PUSH, "ddp" ) < 0 ) {
- LOG(log_error, logtype_default, "I_PUSH: %m" );
+ LOG(log_error, logtype_atalkd, "I_PUSH: %m" );
close(fd);
return -1;
}
if ( ioctl( fd, IF_UNITSEL, ppa ) < 0 ) {
- LOG(log_error, logtype_default, "IF_UNITSEL: %m" );
+ LOG(log_error, logtype_atalkd, "IF_UNITSEL: %m" );
close(fd);
return -1;
}
return -1;
}
- LOG(log_info, logtype_default, "plumbed %s%d", device, ppa );
+ LOG(log_info, logtype_atalkd, "plumbed %s%d", device, ppa );
}
return( 0 );
/*
- * $Id: main.c,v 1.15 2002-09-12 17:21:15 srittau Exp $
+ * $Id: main.c,v 1.16 2002-09-29 23:24:47 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
continue;
#endif /* SIOCDIFADDR != SIOCATALKDIFADDR */
#endif /* SIOCATALKIFADDR */
- LOG(log_error, logtype_default, "difaddr(%u.%u): %s",
+ LOG(log_error, logtype_atalkd, "difaddr(%u.%u): %s",
ntohs(iface->i_addr.sat_addr.s_net),
iface->i_addr.sat_addr.s_node, strerror(errno));
}
if ( iface->i_time < 3 ) {
if ( iface->i_flags & IFACE_PHASE1 ) {
if (rtmp_request( iface ) < 0) {
- LOG(log_error, logtype_default, "rtmp_request: %s", strerror(errno));
+ LOG(log_error, logtype_atalkd, "rtmp_request: %s", strerror(errno));
atalkd_exit(1);
}
newrtmpdata = 1;
} else {
if (zip_getnetinfo( iface ) < 0) {
- LOG(log_error, logtype_default, "zip_getnetinfo: %s", strerror(errno));
+ LOG(log_error, logtype_atalkd, "zip_getnetinfo: %s", strerror(errno));
atalkd_exit(1);
}
sentzipq = 1;
* No seed info, and we've got multiple interfaces.
* Wait forever.
*/
- LOG(log_info, logtype_default,
+ LOG(log_info, logtype_atalkd,
"as_timer multiple interfaces, no seed" );
- LOG(log_info, logtype_default, "as_timer can't configure %s",
+ LOG(log_info, logtype_atalkd, "as_timer can't configure %s",
iface->i_name );
- LOG(log_info, logtype_default, "as_timer waiting for router" );
+ LOG(log_info, logtype_atalkd, "as_timer waiting for router" );
iface->i_time = 0;
continue;
} else {
for ( zt = iface->i_czt; zt; zt = zt->zt_next ) {
if (addzone( iface->i_rt, zt->zt_len,
zt->zt_name) < 0) {
- LOG(log_error, logtype_default, "addzone: %s", strerror(errno));
+ LOG(log_error, logtype_atalkd, "addzone: %s", strerror(errno));
atalkd_exit(1);
}
}
iface->i_rt->rt_flags |= RTMPTAB_HASZONES;
}
if ( iface->i_flags & IFACE_PHASE1 ) {
- LOG(log_info, logtype_default,
+ LOG(log_info, logtype_atalkd,
"as_timer configured %s phase 1 from seed",
iface->i_name );
setaddr( iface, IFACE_PHASE1,
iface->i_caddr.sat_addr.s_net,
iface->i_caddr.sat_addr.s_net );
} else {
- LOG(log_info, logtype_default,
+ LOG(log_info, logtype_atalkd,
"as_timer configured %s phase 2 from seed",
iface->i_name );
}
if ( looproute( iface, RTMP_ADD )) { /* -1 or 1 */
- LOG(log_error, logtype_default,
+ LOG(log_error, logtype_atalkd,
"as_timer: can't route %u.%u to loop: %s",
ntohs( iface->i_addr.sat_addr.s_net ),
iface->i_addr.sat_addr.s_node,
* Configure for no router operation. Wait for a route
* to become available in rtmp_packet().
*/
- LOG(log_info, logtype_default, "config for no router" );
+ LOG(log_info, logtype_atalkd, "config for no router" );
if ( iface->i_flags & IFACE_PHASE2 ) {
iface->i_rt->rt_firstnet = 0;
0, htons( STARTUP_LASTNET ));
}
if ( looproute( iface, RTMP_ADD ) ) { /* -1 or 1 */
- LOG(log_error, logtype_default,
+ LOG(log_error, logtype_atalkd,
"as_timer: can't route %u.%u to loopback: %s",
ntohs( iface->i_addr.sat_addr.s_net ),
iface->i_addr.sat_addr.s_node,
* our zone has gone away.
*/
if ( ++gate->g_state >= RTMPTAB_BAD ) {
- LOG(log_info, logtype_default, "as_timer gateway %u.%u down",
+ LOG(log_info, logtype_atalkd, "as_timer gateway %u.%u down",
ntohs( gate->g_sat.sat_addr.s_net ),
gate->g_sat.sat_addr.s_node );
rtmp = gate->g_rt;
} else {
rtmp->rt_hops = RTMPHOPS_POISON;
if ((cc = rtmp_replace( rtmp )) < 0) {
- LOG(log_error, logtype_default, "rtmp_replace: %s", strerror(errno));
+ LOG(log_error, logtype_atalkd, "rtmp_replace: %s", strerror(errno));
atalkd_exit(1);
}
if (cc) {
gate->g_iface->i_rt->rt_flags &= ~RTMPTAB_HASZONES;
}
- LOG(log_info, logtype_default, "as_timer last gateway down" );
+ LOG(log_info, logtype_atalkd, "as_timer last gateway down" );
/* Set netrange to 0-fffe. */
if ( gate->g_iface->i_flags & IFACE_PHASE2 ) {
} else {
rtmp->rt_hops = RTMPHOPS_POISON;
if ((cc = rtmp_replace( rtmp )) < 0) {
- LOG(log_error, logtype_default, "rtmp_replace: %s", strerror(errno));
+ LOG(log_error, logtype_atalkd, "rtmp_replace: %s", strerror(errno));
atalkd_exit(1);
}
if (cc)
if ( sendto( zap->ap_fd, packet, cc, 0,
(struct sockaddr *)&sat,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "as_timer sendto: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "as_timer sendto: %s", strerror(errno) );
}
sentzipq = 1;
* ask about, and warn that we can't get it's zone.
*/
if ( rtmp->rt_nzq++ == 3 ) {
- LOG(log_info, logtype_default, "as_timer can't get zone for %u",
+ LOG(log_info, logtype_atalkd, "as_timer can't get zone for %u",
ntohs( rtmp->rt_firstnet ));
}
if ( rtmp->rt_nzq > 3 ) {
if ( sendto( zap->ap_fd, packet, cc, 0, (struct sockaddr *)&sat,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "as_timer sendto: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "as_timer sendto: %s", strerror(errno) );
}
}
}
if ( sendto( rap->ap_fd, packet, data - packet, 0,
(struct sockaddr *)&sat,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "as_timer sendto %u.%u (%u): %s",
+ LOG(log_error, logtype_atalkd, "as_timer sendto %u.%u (%u): %s",
ntohs( sat.sat_addr.s_net ),
sat.sat_addr.s_node,
ntohs( iface->i_rt->rt_firstnet ),
if ( sendto( rap->ap_fd, packet, data - packet, 0,
(struct sockaddr *)&sat,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "as_timer sendto %u.%u (%u): %s",
+ LOG(log_error, logtype_atalkd, "as_timer sendto %u.%u (%u): %s",
ntohs( sat.sat_addr.s_net ),
sat.sat_addr.s_node,
ntohs( iface->i_rt->rt_firstnet ),
if ( stable && !noparent ) {
noparent = 1;
- LOG(log_info, logtype_default, "ready %d/%d/%d", stabletimer, newrtmpdata,
+ LOG(log_info, logtype_atalkd, "ready %d/%d/%d", stabletimer, newrtmpdata,
sentzipq );
if ( !debug ) {
/*
* Seems like we could get here more than once...
*/
if ( kill( getpid(), SIGSTOP ) < 0 ) {
- LOG(log_error, logtype_default, "as_timer: kill-self failed!" );
+ LOG(log_error, logtype_atalkd, "as_timer: kill-self failed!" );
atalkd_exit( 1 );
}
}
for ( lr = zt->zt_rt; lr; lr = lr->l_next ) {
rtmp = (struct rtmptab *)lr->l_data;
if ( rtmp->rt_iprev == 0 && rtmp->rt_gate != 0 ) {
- LOG(log_error, logtype_default, "%.*s has %u-%u (unused)\n",
+ LOG(log_error, logtype_atalkd, "%.*s has %u-%u (unused)\n",
zt->zt_len, zt->zt_name, ntohs( rtmp->rt_firstnet ),
ntohs( rtmp->rt_lastnet ));
atalkd_exit(1);
}
}
if ( lz == 0 ) {
- LOG(log_error, logtype_default, "no map from %u-%u to %.*s\n",
+ LOG(log_error, logtype_atalkd, "no map from %u-%u to %.*s\n",
ntohs( rtmp->rt_firstnet ),
ntohs( rtmp->rt_lastnet ),
zt->zt_len, zt->zt_name );
FILE *rtmpdebug;
if (( rtmpdebug = fopen( _PATH_ATALKDEBUG, "w" )) == NULL ) {
- LOG(log_error, logtype_default, "rtmp: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "rtmp: %s", strerror(errno) );
}
for ( iface = interfaces; iface; iface = iface->i_next ) {
for ( rt = gate->g_rt; rt; rt = rt->rt_next ) {
if ( rt->rt_iprev ) {
if ( gateroute( RTMP_DEL, rt ) < 0 ) {
- LOG(log_error, logtype_default, "as_down remove %u-%u failed: %s",
+ LOG(log_error, logtype_atalkd, "as_down remove %u-%u failed: %s",
ntohs( rt->rt_firstnet ),
ntohs( rt->rt_lastnet ),
strerror(errno) );
}
if ( iface->i_flags & IFACE_LOOP ) {
if (looproute( iface, RTMP_DEL )) {
- LOG(log_error, logtype_default, "as_down remove %s %u.%u failed: %s",
+ LOG(log_error, logtype_atalkd, "as_down remove %s %u.%u failed: %s",
iface->i_name, ntohs( iface->i_addr.sat_addr.s_net ),
iface->i_addr.sat_addr.s_node,
strerror(errno) );
}
}
- LOG(log_info, logtype_default, "done" );
+ LOG(log_info, logtype_atalkd, "done" );
atalkd_exit( 0 );
}
syslog_setup(log_debug, logtype_default, logoption_pid, logfacility_daemon );
#endif /* ultrix */
- LOG(log_info, logtype_default, "restart (%s)", version );
+ LOG(log_info, logtype_atalkd, "restart (%s)", version );
/*
* Socket for use in routing ioctl()s. Can't add routes to our
*/
#ifdef BSD4_4
if (( rtfd = socket( PF_ROUTE, SOCK_RAW, AF_APPLETALK )) < 0 ) {
- LOG(log_error, logtype_default, "route socket: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "route socket: %s", strerror(errno) );
atalkd_exit( 1 );
}
if ( shutdown( rtfd, 0 ) < 0 ) {
- LOG(log_error, logtype_default, "route shutdown: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "route shutdown: %s", strerror(errno) );
atalkd_exit( 1 );
}
#else /* BSD4_4 */
if (( rtfd = socket( AF_APPLETALK, SOCK_DGRAM, 0 )) < 0 ) {
- LOG(log_error, logtype_default, "route socket: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "route socket: %s", strerror(errno) );
atalkd_exit( 1 );
}
#endif /* BSD4_4 */
sigaddset( &sv.sa_mask, SIGTERM );
sv.sa_flags = SA_RESTART;
if ( sigaction( SIGTERM, &sv, NULL) < 0 ) {
- LOG(log_error, logtype_default, "sigterm: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "sigterm: %s", strerror(errno) );
atalkd_exit( 1 );
}
sigaddset( &sv.sa_mask, SIGTERM );
sv.sa_flags = SA_RESTART;
if ( sigaction( SIGUSR1, &sv, NULL) < 0 ) {
- LOG(log_error, logtype_default, "sigusr1: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "sigusr1: %s", strerror(errno) );
atalkd_exit( 1 );
}
sigaddset( &sv.sa_mask, SIGTERM );
sv.sa_flags = SA_RESTART;
if ( sigaction( SIGALRM, &sv, NULL) < 0 ) {
- LOG(log_error, logtype_default, "sigalrm: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "sigalrm: %s", strerror(errno) );
atalkd_exit( 1 );
}
it.it_value.tv_sec = 10L;
it.it_value.tv_usec = 0L;
if ( setitimer( ITIMER_REAL, &it, NULL) < 0 ) {
- LOG(log_error, logtype_default, "setitimer: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "setitimer: %s", strerror(errno) );
atalkd_exit( 1 );
}
errno = 0;
continue;
} else {
- LOG(log_error, logtype_default, "select: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "select: %s", strerror(errno) );
atalkd_exit( 1 );
}
}
fromlen = sizeof( struct sockaddr_at );
if (( c = recvfrom( ap->ap_fd, Packet, sizeof( Packet ),
0, (struct sockaddr *)&sat, &fromlen )) < 0 ) {
- LOG(log_error, logtype_default, "recvfrom: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "recvfrom: %s", strerror(errno) );
continue;
}
#ifdef DEBUG
#endif /* DEBUG */
#ifdef __svr4__
if ( sighold( SIGALRM ) || sighold( SIGUSR1 )) {
- LOG(log_error, logtype_default, "sighold: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "sighold: %s", strerror(errno) );
atalkd_exit( 1 );
}
#else /* __svr4__ */
sigmask( SIGUSR1 ));
#endif /* __svr4__ */
if (( *ap->ap_packet )( ap, &sat, Packet, c ) < 0) {
- LOG(log_error, logtype_default, "ap->ap_packet: %s", strerror(errno));
+ LOG(log_error, logtype_atalkd, "ap->ap_packet: %s", strerror(errno));
atalkd_exit(1);
}
#endif /* DEBUG */
#ifdef __svr4__
if ( sigrelse( SIGUSR1 ) || sigrelse( SIGALRM )) {
- LOG(log_error, logtype_default, "sigrelse: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "sigrelse: %s", strerror(errno) );
atalkd_exit( 1 );
}
#else /* __svr4__ */
/* consistency */
if ( iface->i_flags & IFACE_ADDR ) {
- LOG(log_error, logtype_default, "bootaddr OOPS!" );
+ LOG(log_error, logtype_atalkd, "bootaddr OOPS!" );
atalkd_exit(1);
}
}
} else if (rtmp_request( iface ) < 0) {
- LOG(log_error, logtype_default, "bootaddr (rtmp_request): %s", strerror(errno));
+ LOG(log_error, logtype_atalkd, "bootaddr (rtmp_request): %s", strerror(errno));
atalkd_exit(1);
}
}
} else if (zip_getnetinfo( iface ) < 0) {
- LOG(log_error, logtype_default, "bootaddr (zip_getnetinfo): %s", strerror(errno));
+ LOG(log_error, logtype_atalkd, "bootaddr (zip_getnetinfo): %s", strerror(errno));
atalkd_exit(1);
}
}
if ( iface->i_ports == NULL ) { /* allocate port structures */
for ( i = 0, as = atserv; i < atservNATSERV; i++, as++ ) {
if (( se = getservbyname( as->as_name, "ddp" )) == NULL ) {
- LOG(log_info, logtype_default, "%s: service unknown", as->as_name );
+ LOG(log_info, logtype_atalkd, "%s: service unknown", as->as_name );
} else {
as->as_port = ntohs( se->s_port );
}
if (( ap = (struct atport *)malloc( sizeof( struct atport ))) ==
NULL ) {
- LOG(log_error, logtype_default, "malloc: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "malloc: %s", strerror(errno) );
atalkd_exit( 1 );
}
ap->ap_fd = 0;
memcpy( iface->i_addr.sat_zero, &nr, sizeof( struct netrange ));
if ( ifconfig( iface->i_name, SIOCSIFADDR, &iface->i_addr )) {
- LOG(log_error, logtype_default, "setifaddr: %s (%u-%u): %s. try specifying a \
+ LOG(log_error, logtype_atalkd, "setifaddr: %s (%u-%u): %s. try specifying a \
smaller net range.", iface->i_name, ntohs(first), ntohs(last), strerror(errno));
atalkd_exit( 1 );
}
if ( ifconfig( iface->i_name, SIOCGIFADDR, &iface->i_addr )) {
- LOG(log_error, logtype_default, "getifaddr: %s: %s", iface->i_name, strerror(errno) );
+ LOG(log_error, logtype_atalkd, "getifaddr: %s: %s", iface->i_name, strerror(errno) );
atalkd_exit( 1 );
}
/* open ports */
i = 1; /* enable broadcasts */
#ifdef __svr4__
- LOG(log_info, logtype_default, "setsockopt incompatible w/ Solaris STREAMS module.");
+ LOG(log_info, logtype_atalkd, "setsockopt incompatible w/ Solaris STREAMS module.");
#endif /* __svr4__ */
for ( ap = iface->i_ports; ap; ap = ap->ap_next ) {
if (( ap->ap_fd = socket( AF_APPLETALK, SOCK_DGRAM, 0 )) < 0 ) {
- LOG(log_error, logtype_default, "socket: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "socket: %s", strerror(errno) );
atalkd_exit( 1 );
}
#ifndef __svr4__
if ( bind( ap->ap_fd, (struct sockaddr *)&sat,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "bind %u.%u:%u: %s",
+ LOG(log_error, logtype_atalkd, "bind %u.%u:%u: %s",
ntohs( sat.sat_addr.s_net ),
sat.sat_addr.s_node, sat.sat_port, strerror(errno) );
#ifdef SIOCDIFADDR
/*
- * $Id: multicast.c,v 1.9 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: multicast.c,v 1.10 2002-09-29 23:24:47 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
if (!zt->zt_bcast &&
(zt->zt_bcast = (u_char *) malloc(sizeof( ethermulti ))) == NULL) {
- LOG(log_error, logtype_default, "zone_bcast malloc: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "zone_bcast malloc: %s", strerror(errno) );
return -1;
}
/*
- * $Id: nbp.c,v 1.9 2002-01-17 06:08:55 srittau Exp $
+ * $Id: nbp.c,v 1.10 2002-09-29 23:24:47 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
data += SZ_NBPHDR;
if ( sendto( fd, packet, data - packet, 0, (struct sockaddr *)to,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "sendto: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "sendto: %s", strerror(errno) );
}
}
end = data + len;
if ( data >= end ) {
- LOG(log_info, logtype_default, "nbp_packet malformed packet" );
+ LOG(log_info, logtype_atalkd, "nbp_packet malformed packet" );
return 1;
}
if ( *data++ != DDPTYPE_NBP ) {
- LOG(log_info, logtype_default, "nbp_packet bad ddp type" );
+ LOG(log_info, logtype_atalkd, "nbp_packet bad ddp type" );
return 1;
}
if ( data + SZ_NBPHDR + SZ_NBPTUPLE > end ) {
- LOG(log_info, logtype_default, "nbp_packet: malformed packet" );
+ LOG(log_info, logtype_atalkd, "nbp_packet: malformed packet" );
return 1;
}
memcpy( &nh, data, SZ_NBPHDR );
nbpop = data; /* remember for fwd and brrq */
data += SZ_NBPHDR;
if ( nh.nh_cnt != 1 ) {
- LOG(log_info, logtype_default, "nbp_packet: bad tuple count (%d/%d)", nh.nh_cnt,
+ LOG(log_info, logtype_atalkd, "nbp_packet: bad tuple count (%d/%d)", nh.nh_cnt,
nh.nh_op );
return 1;
}
/* object */
tmplen = (u_char) *data;
if ( data >= end || tmplen > 32 || data + tmplen > end ) {
- LOG(log_info, logtype_default, "nbp_packet: malformed packet" );
+ LOG(log_info, logtype_atalkd, "nbp_packet: malformed packet" );
return 1;
}
nn.nn_objlen = tmplen;
/* type */
tmplen = (u_char) *data;
if ( data >= end || tmplen > 32 || data + tmplen > end ) {
- LOG(log_info, logtype_default, "nbp_packet: malformed packet" );
+ LOG(log_info, logtype_atalkd, "nbp_packet: malformed packet" );
return 1;
}
nn.nn_typelen = tmplen;
/* zone */
tmplen = (u_char) *data;
if ( data >= end || tmplen > 32 || data + tmplen > end ) {
- LOG(log_info, logtype_default, "nbp_packet: malformed packet" );
+ LOG(log_info, logtype_atalkd, "nbp_packet: malformed packet" );
return 1;
}
zonep = data; /* remember for fwd */
data += nn.nn_zonelen;
if ( data != end ) {
- LOG(log_info, logtype_default, "nbp_packet: malformed packet" );
+ LOG(log_info, logtype_atalkd, "nbp_packet: malformed packet" );
return 1;
}
/* calculate and save multicast address */
if (zone_bcast(zt) < 0) {
- LOG(log_error, logtype_default, "nbp_packet: zone_bcast");
+ LOG(log_error, logtype_atalkd, "nbp_packet: zone_bcast");
return -1;
}
if ( zt == (struct ziptab *)l->l_data ) {
/* add multicast */
if (addmulti(iface->i_name, zt->zt_bcast) < 0) {
- LOG(log_error, logtype_default, "nbp_packet: addmulti: %s",
+ LOG(log_error, logtype_atalkd, "nbp_packet: addmulti: %s",
strerror(errno) );
return -1;
}
if (( ntab = (struct nbptab *)malloc( sizeof( struct nbptab )))
== 0 ) {
- LOG(log_error, logtype_default, "nbp_packet: malloc: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "nbp_packet: malloc: %s", strerror(errno) );
return -1;
}
memcpy( &ntab->nt_nve, &nn, sizeof( struct nbpnve ));
if ( sendto( ap->ap_fd, data - len, len, 0, (struct sockaddr *)&sat,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "nbp brrq sendto: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "nbp brrq sendto: %s", strerror(errno) );
}
locallkup = 1;
}
}
if ( !iface ) {
- LOG(log_error, logtype_default, "nbp_packet: \
+ LOG(log_error, logtype_atalkd, "nbp_packet: \
Can't find route's interface!" );
return -1;
}
}
}
if ( !ap ) {
- LOG(log_error, logtype_default, "nbp_packet: Can't find port!" );
+ LOG(log_error, logtype_atalkd, "nbp_packet: Can't find port!" );
return -1;
}
if ( sendto( ap->ap_fd, data - len, len, 0,
(struct sockaddr *)&sat,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "nbp brrq sendto %u.%u: %s",
+ LOG(log_error, logtype_atalkd, "nbp brrq sendto %u.%u: %s",
ntohs( sat.sat_addr.s_net ), sat.sat_addr.s_node,
strerror(errno) );
continue;
from->sat_addr.s_node = ATADDR_BCAST;
if ( sendto( ap->ap_fd, data - len, len, 0, (struct sockaddr *)from,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "nbp fwd sendto %u.%u: %s",
+ LOG(log_error, logtype_atalkd, "nbp fwd sendto %u.%u: %s",
ntohs( from->sat_addr.s_net ), from->sat_addr.s_node,
strerror(errno) );
return 0;
if ( sendto( ap->ap_fd, packet, cc, 0,
(struct sockaddr *)&nn.nn_sat,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "nbp lkup sendto %u.%u: %s",
+ LOG(log_error, logtype_atalkd, "nbp lkup sendto %u.%u: %s",
ntohs( nn.nn_sat.sat_addr.s_net ),
nn.nn_sat.sat_addr.s_node,
strerror(errno) );
if ( sendto( ap->ap_fd, packet, cc, 0,
(struct sockaddr *)&nn.nn_sat,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "nbp lkup sendto %u.%u: %s",
+ LOG(log_error, logtype_atalkd, "nbp lkup sendto %u.%u: %s",
ntohs( nn.nn_sat.sat_addr.s_net ),
nn.nn_sat.sat_addr.s_node,
strerror(errno) );
break;
default :
- LOG(log_info, logtype_default, "nbp_packet: bad op (%d)", nh.nh_op );
+ LOG(log_info, logtype_atalkd, "nbp_packet: bad op (%d)", nh.nh_op );
return 1;
}
/*
- * $Id: rtmp.c,v 1.11 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: rtmp.c,v 1.12 2002-09-29 23:24:47 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
* configuration with RTMP.
*/
if ( iface->i_flags & IFACE_PHASE2 ) {
- LOG(log_info, logtype_default, "rtmp_config ignoring data" );
+ LOG(log_info, logtype_atalkd, "rtmp_config ignoring data" );
return 0;
}
if ( rh->rh_net != iface->i_addr.sat_addr.s_net ) {
if (( iface->i_flags & IFACE_SEED ) &&
rh->rh_net != iface->i_caddr.sat_addr.s_net) {
- LOG(log_error, logtype_default, "rtmp_config net mismatch %u != %u",
+ LOG(log_error, logtype_atalkd, "rtmp_config net mismatch %u != %u",
ntohs( rh->rh_net ),
ntohs( iface->i_addr.sat_addr.s_net ));
return 1;
return -1;
if (cc) {
- LOG(log_error, logtype_default, "rtmp_config: can't route %u.%u to loopback: %s",
+ LOG(log_error, logtype_atalkd, "rtmp_config: can't route %u.%u to loopback: %s",
ntohs( iface->i_addr.sat_addr.s_net ),
iface->i_addr.sat_addr.s_node,
strerror(errno) );
}
- LOG(log_info, logtype_default, "rtmp_config configured %s", iface->i_name );
+ LOG(log_info, logtype_atalkd, "rtmp_config configured %s", iface->i_name );
iface->i_flags |= IFACE_CONFIG;
if ( iface == ciface ) {
ciface = ciface->i_next;
}
}
if ( lr == NULL ) {
- LOG(log_error, logtype_default, "rtmp_copyzones z -> r without r -> z, abort" );
+ LOG(log_error, logtype_atalkd, "rtmp_copyzones z -> r without r -> z, abort" );
return -1;
}
}
{
struct gate *gate;
- LOG(log_info, logtype_default, "rtmp_free: %u-%u", ntohs(rtmp->rt_firstnet),
+ LOG(log_info, logtype_atalkd, "rtmp_free: %u-%u", ntohs(rtmp->rt_firstnet),
ntohs(rtmp->rt_lastnet));
if ( rtmp->rt_iprev ) {
rtmp_delinuse( rtmp );
struct gate *gate;
struct rtmptab *rtmp, *found = NULL;
- LOG(log_info, logtype_default, "rtmp_replace %u-%u", ntohs(replace->rt_firstnet),
+ LOG(log_info, logtype_atalkd, "rtmp_replace %u-%u", ntohs(replace->rt_firstnet),
ntohs(replace->rt_lastnet));
for ( iface = interfaces; iface; iface = iface->i_next ) {
if ((replace->rt_iface != iface) &&
if ( i ) { /* can we get here without r being set? */
if ( r->rt_firstnet != rtmp->rt_firstnet ||
r->rt_lastnet != rtmp->rt_lastnet ) {
- LOG(log_info, logtype_default, "rtmp_new netrange mismatch %u-%u != %u-%u",
+ LOG(log_info, logtype_atalkd, "rtmp_new netrange mismatch %u-%u != %u-%u",
ntohs( r->rt_firstnet ), ntohs( r->rt_lastnet ),
ntohs( rtmp->rt_firstnet ), ntohs( rtmp->rt_lastnet ));
return 1;
end = data + len;
if ( data >= end ) {
- LOG(log_info, logtype_default, "rtmp_packet no data" );
+ LOG(log_info, logtype_atalkd, "rtmp_packet no data" );
return 1;
}
* Response and Data.
*/
if ( data + sizeof( struct rtmprdhdr ) > end ) {
- LOG(log_info, logtype_default, "rtmp_packet no data header" );
+ LOG(log_info, logtype_atalkd, "rtmp_packet no data header" );
return 1;
}
memcpy( &rh, data, sizeof( struct rtmprdhdr ));
/* check rh address against from address */
if ( rh.rh_nodelen != 8 ) {
- LOG(log_info, logtype_default, "rtmp_packet bad node len (%d)", rh.rh_nodelen );
+ LOG(log_info, logtype_atalkd, "rtmp_packet bad node len (%d)", rh.rh_nodelen );
return 1;
}
if (( from->sat_addr.s_net != 0 &&
from->sat_addr.s_net != rh.rh_net ) ||
from->sat_addr.s_node != rh.rh_node ) {
- LOG(log_info, logtype_default, "rtmp_packet address mismatch" );
+ LOG(log_info, logtype_atalkd, "rtmp_packet address mismatch" );
return 1;
}
if ( iface->i_flags & IFACE_NOROUTER ) {
/* remove addr to loopback route */
if ((cc = looproute( iface, RTMP_DEL )) < 0) {
- LOG(log_error, logtype_default, "rtmp_packet: looproute");
+ LOG(log_error, logtype_atalkd, "rtmp_packet: looproute");
return -1;
}
if (cc)
- LOG(log_error, logtype_default, "rtmp_packet: can't remove loopback: %s",
+ LOG(log_error, logtype_atalkd, "rtmp_packet: can't remove loopback: %s",
strerror(errno) );
iface->i_flags &= ~IFACE_NOROUTER;
iface->i_time = 0;
- LOG(log_info, logtype_default, "rtmp_packet router has become available" );
+ LOG(log_info, logtype_atalkd, "rtmp_packet router has become available" );
}
if ( iface->i_flags & IFACE_PHASE1 ) {
if (rtmp_config( &rh, iface ) < 0) {
- LOG(log_error, logtype_default, "rtmp_packet: rtmp_config");
+ LOG(log_error, logtype_atalkd, "rtmp_packet: rtmp_config");
return -1;
}
} else if (zip_getnetinfo( iface ) < 0) {
- LOG(log_error, logtype_default, "rtmp_packet: zip_getnetinfo");
+ LOG(log_error, logtype_atalkd, "rtmp_packet: zip_getnetinfo");
return -1;
}
return 0;
* Parse first tuple. For phase 2, verify that net is correct.
*/
if ( data + SZ_RTMPTUPLE > end ) {
- LOG(log_info, logtype_default, "rtmp_packet missing first tuple" );
+ LOG(log_info, logtype_atalkd, "rtmp_packet missing first tuple" );
return 1;
}
memcpy( &rt, data, SZ_RTMPTUPLE );
if ( rt.rt_net == 0 ) {
if ( rt.rt_dist != 0x82 ) {
- LOG(log_info, logtype_default, "rtmp_packet bad phase 1 version" );
+ LOG(log_info, logtype_atalkd, "rtmp_packet bad phase 1 version" );
return 1;
}
* no extended tuples in this packet.
*/
if ( data + SZ_RTMPTUPLE > end ) {
- LOG(log_info, logtype_default, "rtmp_packet missing second tuple" );
+ LOG(log_info, logtype_atalkd, "rtmp_packet missing second tuple" );
return 1;
}
memcpy( &rt, data, SZ_RTMPTUPLE );
data += SZ_RTMPTUPLE;
} else if ( rt.rt_dist & 0x80 ) {
if ( data + SZ_RTMPTUPLE > end ) {
- LOG(log_info, logtype_default, "rtmp_packet missing first range-end" );
+ LOG(log_info, logtype_atalkd, "rtmp_packet missing first range-end" );
return 1;
}
memcpy( &xrt, data, SZ_RTMPTUPLE );
data += SZ_RTMPTUPLE;
if ( xrt.rt_dist != 0x82 ) {
- LOG(log_info, logtype_default, "rtmp_packet bad phase 2 version" );
+ LOG(log_info, logtype_atalkd, "rtmp_packet bad phase 2 version" );
return 1;
}
*/
if ( rt.rt_net != iface->i_rt->rt_firstnet ||
xrt.rt_net != iface->i_rt->rt_lastnet ) {
- LOG(log_info, logtype_default, "rtmp_packet interface mismatch" );
+ LOG(log_info, logtype_atalkd, "rtmp_packet interface mismatch" );
return 1;
}
} else {
* might just as well check it.
if ( rt.rt_net != iface->i_rt->rt_firstnet ||
rt.rt_net != iface->i_rt->rt_lastnet ) {
- LOG(log_info, logtype_default, "rtmp_packet phase 1 interface mismatch" );
+ LOG(log_info, logtype_atalkd, "rtmp_packet phase 1 interface mismatch" );
return 1;
}
*/
#else /* PHASE1NET */
- LOG(log_info, logtype_default, "rtmp_packet bad first tuple" );
+ LOG(log_info, logtype_atalkd, "rtmp_packet bad first tuple" );
return 1;
#endif /* PHASE1NET */
}
}
if ( !gate ) { /* new gateway */
if (( gate = (struct gate *)malloc( sizeof( struct gate ))) == 0 ) {
- LOG(log_error, logtype_default, "rtmp_packet: malloc: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "rtmp_packet: malloc: %s", strerror(errno) );
return -1;
}
gate->g_next = iface->i_gate;
iface->i_gate->g_prev = gate;
}
iface->i_gate = gate;
- LOG(log_info, logtype_default, "rtmp_packet gateway %u.%u up",
+ LOG(log_info, logtype_atalkd, "rtmp_packet gateway %u.%u up",
ntohs( gate->g_sat.sat_addr.s_net ),
gate->g_sat.sat_addr.s_node );
}
* ugly.)
*/
if ( rtmp->rt_firstnet != rt.rt_net ) {
- LOG(log_info, logtype_default, "rtmp_packet firstnet mismatch %u!=%u",
+ LOG(log_info, logtype_atalkd, "rtmp_packet firstnet mismatch %u!=%u",
ntohs( rtmp->rt_firstnet ), ntohs( rt.rt_net ));
return 1;
}
if ( rt.rt_dist & 0x80 ) {
if (( rtmp->rt_flags & RTMPTAB_EXTENDED ) == 0 ) {
- LOG(log_info, logtype_default, "rtmp_packet extended mismatch %u",
+ LOG(log_info, logtype_atalkd, "rtmp_packet extended mismatch %u",
ntohs( rtmp->rt_firstnet ));
return 1;
}
if ( rtmp->rt_lastnet != xrt.rt_net ) {
- LOG(log_info, logtype_default, "rtmp_packet lastnet mismatch %u!=%u",
+ LOG(log_info, logtype_atalkd, "rtmp_packet lastnet mismatch %u!=%u",
ntohs( rtmp->rt_lastnet ), ntohs( xrt.rt_net ));
return 1;
}
} else {
if ( rtmp->rt_flags & RTMPTAB_EXTENDED ) {
- LOG(log_info, logtype_default, "rtmp_packet !extended mismatch %u",
+ LOG(log_info, logtype_atalkd, "rtmp_packet !extended mismatch %u",
ntohs( rtmp->rt_firstnet ));
return 1;
}
if ( rtmp->rt_lastnet != rt.rt_net ) {
- LOG(log_info, logtype_default, "rtmp_packet lastnet mismatch %u!=%u",
+ LOG(log_info, logtype_atalkd, "rtmp_packet lastnet mismatch %u!=%u",
ntohs( rtmp->rt_lastnet ), ntohs( rt.rt_net ));
return 1;
}
rtmp->rt_hops = ( rt.rt_dist & 0x7f ) + 1;
}
if (rtmp_replace( rtmp ) < 0) {
- LOG(log_error, logtype_default, "rtmp_packet: rtmp_replace");
+ LOG(log_error, logtype_atalkd, "rtmp_packet: rtmp_replace");
return -1;
}
}
rtmp->rt_hops = ( rt.rt_dist & 0x7f ) + 1;
if ( rtmp->rt_hops > ( rt.rt_dist & 0x7f ) + 1 ) {
if (rtmp_new( rtmp ) < 0) {
- LOG(log_error, logtype_default, "rtmp_packet: rtmp_new");
+ LOG(log_error, logtype_atalkd, "rtmp_packet: rtmp_new");
return -1;
}
}
rtmp->rt_next = 0;
}
} else if (( rt.rt_dist & 0x7f ) + 1 > RTMPHOPS_MAX ) {
- LOG(log_info, logtype_default, "rtmp_packet bad hop count from %u.%u for %u",
+ LOG(log_info, logtype_atalkd, "rtmp_packet bad hop count from %u.%u for %u",
ntohs( from->sat_addr.s_net ), from->sat_addr.s_node,
ntohs( rt.rt_net ));
} else { /* new for router */
if (( rtmp = newrt(iface)) == NULL ) {
- LOG(log_error, logtype_default, "rtmp_packet: newrt: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "rtmp_packet: newrt: %s", strerror(errno) );
return -1;
}
rtmp->rt_firstnet = rt.rt_net;
}
if (rtmp_new( rtmp ) < 0) {
- LOG(log_error, logtype_default, "rtmp_packet: rtmp_new");
+ LOG(log_error, logtype_atalkd, "rtmp_packet: rtmp_new");
return -1;
}
}
data += SZ_RTMPTUPLE;
if ( rt.rt_dist & 0x80 ) {
if ( data + SZ_RTMPTUPLE > end ) {
- LOG(log_info, logtype_default, "rtmp_packet missing range-end" );
+ LOG(log_info, logtype_atalkd, "rtmp_packet missing range-end" );
return 1;
}
memcpy( &xrt, data, SZ_RTMPTUPLE );
* Make sure we've processed the whole packet.
*/
if ( data != end ) {
- LOG(log_info, logtype_default, "rtmp_packet length and count mismatch" );
+ LOG(log_info, logtype_atalkd, "rtmp_packet length and count mismatch" );
}
break;
if ( sendto( ap->ap_fd, packet, data - packet, 0,
(struct sockaddr *)from,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "as_timer sendto: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "as_timer sendto: %s", strerror(errno) );
}
} else if ( *data == 2 || *data == 3 ) {
#ifdef DEBUG
from->sat_addr.s_node );
#endif /* DEBUG */
} else {
- LOG(log_info, logtype_default, "rtmp_packet unknown request from %u.%u\n",
+ LOG(log_info, logtype_atalkd, "rtmp_packet unknown request from %u.%u\n",
ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
}
break;
default :
- LOG(log_info, logtype_default, "rtmp_packet bad ddp type from %u.%u",
+ LOG(log_info, logtype_atalkd, "rtmp_packet bad ddp type from %u.%u",
ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
return 0;
}
struct atport *ap;
char *data, packet[ 2 ];
- LOG(log_info, logtype_default, "rtmp_request for %s", iface->i_name );
+ LOG(log_info, logtype_atalkd, "rtmp_request for %s", iface->i_name );
for ( ap = iface->i_ports; ap; ap = ap->ap_next ) {
if ( ap->ap_packet == rtmp_packet ) {
}
}
if ( ap == 0 ) {
- LOG(log_error, logtype_default, "rtmp_request can't find rtmp socket!" );
+ LOG(log_error, logtype_atalkd, "rtmp_request can't find rtmp socket!" );
return -1;
}
sat.sat_port = ap->ap_port;
if ( sendto( ap->ap_fd, packet, data - packet, 0, (struct sockaddr *)&sat,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "rtmp_request sendto: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "rtmp_request sendto: %s", strerror(errno) );
return -1;
}
return 0;
struct sockaddr_at dst, loop;
if ( cmd == RTMP_DEL && ( iface->i_flags & IFACE_LOOP ) == 0 ) {
- LOG(log_error, logtype_default, "looproute panic no route" );
+ LOG(log_error, logtype_atalkd, "looproute panic no route" );
return -1;
}
if ( cmd == RTMP_ADD && ( iface->i_flags & IFACE_LOOP )) {
- LOG(log_error, logtype_default, "looproute panic two routes" );
+ LOG(log_error, logtype_atalkd, "looproute panic two routes" );
return -1;
}
(struct sockaddr *) &dst,
(struct sockaddr *) &gate,
RTF_UP | RTF_GATEWAY )) {
- LOG(log_error, logtype_default, "route: %u -> %u.%u: %s", net,
+ LOG(log_error, logtype_atalkd, "route: %u -> %u.%u: %s", net,
ntohs( gate.sat_addr.s_net ), gate.sat_addr.s_node,
strerror(errno) );
continue;
(struct sockaddr_at *) &dst,
(struct sockaddr_at *) &gate,
RTF_UP | RTF_GATEWAY )) {
- LOG(log_error, logtype_default, "route: %u -> %u.%u: %m", net,
+ LOG(log_error, logtype_atalkd, "route: %u -> %u.%u: %m", net,
ntohs( gate.sat_addr.s_net ), gate.sat_addr.s_node );
continue;
}
/*
- * $Id: zip.c,v 1.10 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: zip.c,v 1.11 2002-09-29 23:24:47 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
}
}
if ( l == 0 ) {
- LOG(log_error, logtype_default, "zonecheck: %.*s not in zone list", czt->zt_len,
+ LOG(log_error, logtype_atalkd, "zonecheck: %.*s not in zone list", czt->zt_len,
czt->zt_name );
return( -1 ); /* configured zone not found in net zones */
}
;
if ( cztcnt != ztcnt ) {
- LOG(log_error, logtype_default, "zonecheck: %d configured zones, %d zones found",
+ LOG(log_error, logtype_atalkd, "zonecheck: %d configured zones, %d zones found",
cztcnt, ztcnt );
return( -1 ); /* more net zones than configured zones */
}
end = data + len;
if ( data >= end ) {
- LOG(log_info, logtype_default, "zip_packet malformed packet" );
+ LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
return 1;
}
switch( *data++ ) {
case DDPTYPE_ZIP :
if ( data + sizeof( struct ziphdr ) > end ) {
- LOG(log_info, logtype_default, "zip_packet malformed packet" );
+ LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
return 1;
}
memcpy( &zh, data, sizeof( struct ziphdr ));
if ( sendto( ap->ap_fd, packet, reply - packet, 0,
(struct sockaddr *)from,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "zip reply sendto: %s",
+ LOG(log_error, logtype_atalkd, "zip reply sendto: %s",
strerror(errno) );
}
if ( sendto( ap->ap_fd, packet, reply - packet,
0, (struct sockaddr *)from,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "zip reply sendto: %s",
+ LOG(log_error, logtype_atalkd, "zip reply sendto: %s",
strerror(errno) );
}
if ( sendto( ap->ap_fd, packet, reply - packet, 0,
(struct sockaddr *)from,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "zip reply sendto: %s",
+ LOG(log_error, logtype_atalkd, "zip reply sendto: %s",
strerror(errno) );
}
if ( sendto( ap->ap_fd, packet, reply - packet, 0,
(struct sockaddr *)from,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "zip reply sendto: %s",
+ LOG(log_error, logtype_atalkd, "zip reply sendto: %s",
strerror(errno) );
}
}
}
}
if ( gate == NULL ) {
- LOG(log_info, logtype_default, "zip reply from non-gateway %u.%u",
+ LOG(log_info, logtype_atalkd, "zip reply from non-gateway %u.%u",
ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
return 1;
}
do {
if ( data + sizeof( u_short ) + 1 > end ) { /* + strlen */
- LOG(log_info, logtype_default, "zip reply short (%d)", len );
+ LOG(log_info, logtype_atalkd, "zip reply short (%d)", len );
return 1;
}
memcpy( &firstnet, data, sizeof( u_short ));
/* XXX */
if ( rtmp->rt_gate == NULL &&
zonecheck( rtmp, gate->g_iface ) != 0 ) {
- LOG(log_error, logtype_default, "zip_packet seed zonelist mismatch" );
+ LOG(log_error, logtype_atalkd, "zip_packet seed zonelist mismatch" );
return -1;
}
rtmp->rt_flags &= ~RTMPTAB_ZIPQUERY;
zlen = *data++;
if ( zlen > 32 || zlen <= 0 ) {
- LOG(log_info, logtype_default, "zip reply bad packet" );
+ LOG(log_info, logtype_atalkd, "zip reply bad packet" );
return 1;
}
if ( data + zlen > end ) {
- LOG(log_info, logtype_default, "zip reply short (%d)", len );
+ LOG(log_info, logtype_atalkd, "zip reply short (%d)", len );
return 1;
}
memcpy( zname, data, zlen );
* telling us about the entry.
*/
if ( rtmp == 0 ) {
- LOG(log_info, logtype_default, "zip skip reply %u from %u.%u (no rtmp)",
+ LOG(log_info, logtype_atalkd, "zip skip reply %u from %u.%u (no rtmp)",
ntohs( firstnet ), ntohs( from->sat_addr.s_net ),
from->sat_addr.s_node );
/*
* no good if rtmp is the interface's route).
*/
} else if ( rtmp->rt_iprev == NULL && rtmp->rt_prev != NULL ) {
- LOG(log_info, logtype_default,
+ LOG(log_info, logtype_atalkd,
"zip skip reply %u-%u from %u.%u (rtmp not in use)",
ntohs( rtmp->rt_firstnet ),
ntohs( rtmp->rt_lastnet ),
* net to verify our interface's zone(s).
*/
} else if (( rtmp->rt_flags & RTMPTAB_ZIPQUERY ) == 0 ) {
- LOG(log_info, logtype_default,
+ LOG(log_info, logtype_atalkd,
"zip skip reply %u-%u from %u.%u (no query)",
ntohs( rtmp->rt_firstnet ),
ntohs( rtmp->rt_lastnet ),
from->sat_addr.s_node );
} else {
if (addzone( rtmp, zlen, zname ) < 0) {
- LOG(log_error, logtype_default, "zip_packet: addzone");
+ LOG(log_error, logtype_atalkd, "zip_packet: addzone");
return -1;
}
rtmp->rt_flags |= RTMPTAB_HASZONES;
/* XXX */
if ( rtmp->rt_gate == 0 &&
zonecheck( rtmp, gate->g_iface ) != 0 ) {
- LOG(log_error, logtype_default, "zip_packet seed zonelist mismatch" );
+ LOG(log_error, logtype_atalkd, "zip_packet seed zonelist mismatch" );
return -1;
}
rtmp->rt_flags &= ~RTMPTAB_ZIPQUERY;
}
}
if ( gate == NULL ) {
- LOG(log_info, logtype_default, "zip ereply from non-gateway %u.%u",
+ LOG(log_info, logtype_atalkd, "zip ereply from non-gateway %u.%u",
ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
return 1;
}
* at the top of the do-while loop, below.
*/
if ( data + sizeof( u_short ) + 1 > end ) { /* + strlen */
- LOG(log_info, logtype_default, "zip ereply short (%d)", len );
+ LOG(log_info, logtype_atalkd, "zip ereply short (%d)", len );
return 1;
}
memcpy( &firstnet, data, sizeof( u_short ));
}
}
if ( rtmp == NULL ) {
- LOG(log_info, logtype_default, "zip ereply %u from %u.%u (no rtmp)",
+ LOG(log_info, logtype_atalkd, "zip ereply %u from %u.%u (no rtmp)",
ntohs( firstnet ), ntohs( from->sat_addr.s_net ),
from->sat_addr.s_node );
return 1;
}
if ( rtmp->rt_iprev == 0 ) {
- LOG(log_info, logtype_default,
+ LOG(log_info, logtype_atalkd,
"zip ereply %u-%u from %u.%u (rtmp not in use)",
ntohs( rtmp->rt_firstnet ),
ntohs( rtmp->rt_lastnet ),
}
if (( rtmp->rt_flags & RTMPTAB_ZIPQUERY ) == 0 ) {
- LOG(log_info, logtype_default, "zip ereply %u-%u from %u.%u (no query)",
+ LOG(log_info, logtype_atalkd, "zip ereply %u-%u from %u.%u (no query)",
ntohs( rtmp->rt_firstnet ),
ntohs( rtmp->rt_lastnet ),
ntohs( from->sat_addr.s_net ),
* a big deal, and it makes the end condition cleaner.
*/
if ( data + sizeof( u_short ) + 1 > end ) { /* + strlen */
- LOG(log_info, logtype_default, "zip ereply short (%d)", len );
+ LOG(log_info, logtype_atalkd, "zip ereply short (%d)", len );
return 1;
}
memcpy( &firstnet, data, sizeof( u_short ));
/* check route */
if ( firstnet != rtmp->rt_firstnet ) {
- LOG(log_info, logtype_default, "zip ereply with multiple nets" );
+ LOG(log_info, logtype_atalkd, "zip ereply with multiple nets" );
return 1;
}
zlen = *data++;
if ( zlen > 32 || zlen <= 0 ) {
- LOG(log_info, logtype_default, "zip ereply bad zone length (%d)", zlen );
+ LOG(log_info, logtype_atalkd, "zip ereply bad zone length (%d)", zlen );
return 1;
}
if ( data + zlen > end ) {
- LOG(log_info, logtype_default, "zip ereply short (%d)", len );
+ LOG(log_info, logtype_atalkd, "zip ereply short (%d)", len );
return 1;
}
memcpy( zname, data, zlen );
data += zlen;
if (addzone( rtmp, zlen, zname ) < 0) {
- LOG(log_error, logtype_default, "zip_packet: addzone");
+ LOG(log_error, logtype_atalkd, "zip_packet: addzone");
return -1;
}
} while ( data < end );
/* XXX */
if ( rtmp->rt_gate == 0 &&
zonecheck( rtmp, gate->g_iface ) != 0 ) {
- LOG(log_error, logtype_default, "zip_packet seed zonelist mismatch" );
+ LOG(log_error, logtype_atalkd, "zip_packet seed zonelist mismatch" );
return -1;
}
rtmp->rt_flags &= ~RTMPTAB_ZIPQUERY;
}
if ( zh.zh_zero != 0 || data + 2 * sizeof( u_short ) > end ) {
- LOG(log_info, logtype_default, "zip_packet malformed packet" );
+ LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
return 1;
}
memcpy( &lastnet, data, sizeof( u_short ));
data += sizeof( u_short );
if ( firstnet != 0 || lastnet != 0 || data >= end ) {
- LOG(log_info, logtype_default, "zip_packet malformed packet" );
+ LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
return 1;
}
zlen = *data++;
if ( zlen < 0 || zlen > 32 ) {
- LOG(log_info, logtype_default, "zip_packet malformed packet" );
+ LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
return 1;
}
memcpy( zname, data, zlen );
/* multicast */
*data++ = 6; /* sizeof ??? */
if (zone_bcast(zt) < 0) {
- LOG(log_error, logtype_default, "zip_packet: zone_bcast");
+ LOG(log_error, logtype_atalkd, "zip_packet: zone_bcast");
return -1;
}
memcpy(data, zt->zt_bcast, 6);
if ( sendto( ap->ap_fd, packet, data - packet, 0,
(struct sockaddr *)from,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "zip gni sendto %u.%u: %s",
+ LOG(log_error, logtype_atalkd, "zip gni sendto %u.%u: %s",
ntohs( from->sat_addr.s_net ), from->sat_addr.s_node,
strerror(errno) );
return 1;
/*
* Ignore ZIP GNIReplys which are either late or unsolicited.
*/
- LOG(log_debug, logtype_default, "zip gnireply from %u.%u (%s %x)",
+ LOG(log_debug, logtype_atalkd, "zip gnireply from %u.%u (%s %x)",
ntohs( from->sat_addr.s_net ), from->sat_addr.s_node,
iface->i_name, iface->i_flags );
if (( iface->i_flags & ( IFACE_CONFIG|IFACE_PHASE1 )) ||
( iface->i_flags & IFACE_ADDR ) == 0 ) {
- LOG(log_debug, logtype_default, "zip ignoring gnireply" );
+ LOG(log_debug, logtype_atalkd, "zip ignoring gnireply" );
return 1;
}
if ( data + 2 * sizeof( u_short ) > end ) {
- LOG(log_info, logtype_default, "zip_packet malformed packet" );
+ LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
return 1;
}
memcpy( &firstnet, data, sizeof( u_short ));
* default zone is.
*/
if ( data >= end || data + *data > end ) {
- LOG(log_info, logtype_default, "zip_packet malformed packet" );
+ LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
return 1;
}
if ( *data++ != 0 ) {
- LOG(log_info, logtype_default, "zip_packet unsolicited zone" );
+ LOG(log_info, logtype_atalkd, "zip_packet unsolicited zone" );
return 1;
}
/* skip multicast (should really check it) */
if ( data >= end || data + *data > end ) {
- LOG(log_info, logtype_default, "zip_packet malformed packet" );
+ LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
return 1;
}
data += *data + 1;
if ( data >= end || data + *data > end ) {
- LOG(log_info, logtype_default, "zip_packet malformed packet" );
+ LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
return 1;
}
if ( iface->i_czt->zt_len != *data ||
strndiacasecmp( iface->i_czt->zt_name,
data + 1, *data ) != 0 ) {
- LOG(log_error, logtype_default, "default zone mismatch on %s",
+ LOG(log_error, logtype_atalkd, "default zone mismatch on %s",
iface->i_name );
- LOG(log_error, logtype_default, "%.*s != %.*s",
+ LOG(log_error, logtype_atalkd, "%.*s != %.*s",
iface->i_czt->zt_len, iface->i_czt->zt_name,
*data, data + 1 );
- LOG(log_error, logtype_default, "Seed error! Exiting!" );
+ LOG(log_error, logtype_atalkd, "Seed error! Exiting!" );
return -1;
}
}
if (addzone( iface->i_rt, *data, data + 1 ) < 0) {
- LOG(log_error, logtype_default, "zip_packet: addzone");
+ LOG(log_error, logtype_atalkd, "zip_packet: addzone");
return -1;
}
if ( firstnet != iface->i_rt->rt_firstnet ||
lastnet != iface->i_rt->rt_lastnet ) {
if ( iface->i_flags & IFACE_SEED ) {
- LOG(log_error, logtype_default, "netrange mismatch on %s",
+ LOG(log_error, logtype_atalkd, "netrange mismatch on %s",
iface->i_name );
- LOG(log_error, logtype_default, "%u-%u != %u-%u",
+ LOG(log_error, logtype_atalkd, "%u-%u != %u-%u",
ntohs( firstnet ), ntohs( lastnet ),
ntohs( iface->i_rt->rt_firstnet ),
ntohs( iface->i_rt->rt_lastnet ));
- LOG(log_error, logtype_default, "Seed error! Exiting!" );
+ LOG(log_error, logtype_atalkd, "Seed error! Exiting!" );
return -1;
}
/* add addr to loopback route */
if ( looproute( iface, RTMP_ADD )) { /* -1 or 1 */
- LOG(log_error, logtype_default,
+ LOG(log_error, logtype_atalkd,
"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,
return -1;
}
- LOG(log_info, logtype_default, "zip_packet configured %s from %u.%u",
+ LOG(log_info, logtype_atalkd, "zip_packet configured %s from %u.%u",
iface->i_name, ntohs( from->sat_addr.s_net ),
from->sat_addr.s_node );
iface->i_flags |= IFACE_CONFIG;
break;
default :
- LOG(log_info, logtype_default, "zip_packet bad zip op from %u.%u\n",
+ LOG(log_info, logtype_atalkd, "zip_packet bad zip op from %u.%u\n",
ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
}
break;
case DDPTYPE_ATP :
if ( data + sizeof( struct atphdr ) > end ) {
- LOG(log_info, logtype_default, "zip atp malformed packet" );
+ LOG(log_info, logtype_atalkd, "zip atp malformed packet" );
return 1;
}
memcpy( &ah, data, sizeof( struct atphdr ));
data += sizeof( struct atphdr );
if ( ah.atphd_ctrlinfo != ATP_TREQ ) {
- LOG(log_info, logtype_default, "zip atp bad control" );
+ LOG(log_info, logtype_atalkd, "zip atp bad control" );
return 1;
}
ah.atphd_ctrlinfo = ATP_TRESP | ATP_EOM;
if ( ah.atphd_bitmap != 1 ) {
- LOG(log_error, logtype_default, "zip atp bad bitmap" );
+ LOG(log_error, logtype_atalkd, "zip atp bad bitmap" );
return 1;
}
ah.atphd_bitmap = 0;
data += sizeof( u_short );
index = ntohs( index );
if ( data != end ) {
- LOG(log_info, logtype_default, "zip atp malformed packet" );
+ LOG(log_info, logtype_atalkd, "zip atp malformed packet" );
return 1;
}
switch ( zipop ) {
case ZIPOP_GETMYZONE :
if ( index != 0 ) {
- LOG(log_info, logtype_default, "zip atp gmz bad index" );
+ LOG(log_info, logtype_atalkd, "zip atp gmz bad index" );
return 1;
}
}
zt = (struct ziptab *)iface->i_rt->rt_zt->l_data;
if ( data + 1 + zt->zt_len > end ) {
- LOG(log_info, logtype_default, "zip atp gmz reply too long" );
+ LOG(log_info, logtype_atalkd, "zip atp gmz reply too long" );
return 1;
}
*data++ = zt->zt_len;
break;
default :
- LOG(log_info, logtype_default, "zip atp bad option" );
+ LOG(log_info, logtype_atalkd, "zip atp bad option" );
return 1;
}
if ( sendto( ap->ap_fd, packet, data - packet, 0,
(struct sockaddr *)from,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "zip atp sendto %u.%u: %s",
+ LOG(log_error, logtype_atalkd, "zip atp sendto %u.%u: %s",
ntohs( from->sat_addr.s_net ), from->sat_addr.s_node,
strerror(errno) );
return 1;
break;
default :
- LOG(log_info, logtype_default, "zip_packet bad ddp type from %u.%u\n",
+ LOG(log_info, logtype_atalkd, "zip_packet bad ddp type from %u.%u\n",
ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
return 1;
}
char *data, packet[ 40 ];
u_short net;
- LOG(log_info, logtype_default, "zip_getnetinfo for %s", iface->i_name );
+ LOG(log_info, logtype_atalkd, "zip_getnetinfo for %s", iface->i_name );
for ( ap = iface->i_ports; ap; ap = ap->ap_next ) {
if ( ap->ap_packet == zip_packet ) {
}
}
if ( ap == 0 ) {
- LOG(log_error, logtype_default, "zip_getnetinfo can't find zip socket!" );
+ LOG(log_error, logtype_atalkd, "zip_getnetinfo can't find zip socket!" );
return -1;
}
if ( sendto( ap->ap_fd, packet, data - packet, 0, (struct sockaddr *)&sat,
sizeof( struct sockaddr_at )) < 0 ) {
- LOG(log_error, logtype_default, "zip_getnetinfo sendto: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "zip_getnetinfo sendto: %s", strerror(errno) );
return -1;
}
return 0;
}
}
if (( l = (struct list *)malloc( sizeof( struct list ))) == NULL ) {
- LOG(log_error, logtype_default, "add_list malloc: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "add_list malloc: %s", strerror(errno) );
return -1;
}
}
if ( zt == NULL ) {
if (( zt = newzt( len, zone )) == NULL ) {
- LOG(log_error, logtype_default, "addzone newzt: %s", strerror(errno) );
+ LOG(log_error, logtype_atalkd, "addzone newzt: %s", strerror(errno) );
return -1;
}
if ( ziptab == NULL ) {
if (cc) {
if ( !exists ) {
- LOG(log_error, logtype_default, "addzone corrupted route/zone mapping" );
+ LOG(log_error, logtype_atalkd, "addzone corrupted route/zone mapping" );
return -1;
}
/*
return 0;
}
if ( exists ) {
- LOG(log_error, logtype_default, "addzone corrupted zone/route mapping" );
+ LOG(log_error, logtype_atalkd, "addzone corrupted zone/route mapping" );
return -1;
}
return 0;
projects / netatalk.git / commitdiff