+/*
+ * Copyright (c) 1985 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This file includes significant work done at Cornell University by
+ * Bill Nesheim. That work included by permission.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
#ifndef lint
-static char rcsid[] = "$Header$";
-#endif
+static char sccsid[] = "@(#)input.c 5.7 (Berkeley) %G%";
+#endif /* not lint */
/*
* XNS Routing Table Management Daemon
struct sockaddr *
xns_nettosa(net)
-u_short *net;
+union ns_net net;
{
static struct sockaddr_ns sxn;
extern char ether_broadcast_addr[6];
bzero(&sxn, sizeof (struct sockaddr_ns));
sxn.sns_family = AF_NS;
- xnnet(sxn.sns_addr.x_net) = xnnet(net[0]);
+ sxn.sns_addr.x_net = net;
sxn.sns_addr.x_host = *(union ns_host *)ether_broadcast_addr;
return( (struct sockaddr *)&sxn);
switch (ntohs(msg->rip_cmd)) {
case RIPCMD_REQUEST:
- /* Be quiet if we don't have anything interesting to talk about */
- if (!supplier) return;
newsize = 0;
while (size > 0) {
if (size < sizeof (struct netinfo))
* A single entry with rip_dst == DSTNETS_ALL and
* metric ``infinity'' means ``all routes''.
*/
- if (ntohl(xnnet(n->rip_dst[0])) == DSTNETS_ALL &&
+ if (ns_neteqnn(n->rip_dst, ns_anynet) &&
ntohs(n->rip_metric) == HOPCNT_INFINITY &&
size == 0) {
ifp = if_ifwithnet(from);
* request for specific nets
*/
rt = rtlookup(xns_nettosa(n->rip_dst));
+ if (ftrace) {
+ fprintf(ftrace,
+ "specific request for %s",
+ xns_nettoa(n->rip_dst));
+ fprintf(ftrace,
+ " yields route %x\n",
+ rt);
+ }
n->rip_metric = htons( rt == 0 ? HOPCNT_INFINITY :
min(rt->rt_metric+1, HOPCNT_INFINITY));
- n++, newsize += sizeof (struct netinfo);
+ n++;
+ newsize += sizeof (struct netinfo);
}
if (newsize > 0) {
msg->rip_cmd = htons(RIPCMD_RESPONSE);
newsize += sizeof (u_short);
/* should check for if with dstaddr(from) first */
- if(ifp = if_ifwithnet(from))
- (*afp->af_output)(0, from, newsize);
+ (*afp->af_output)(0, from, newsize);
+ ifp = if_ifwithnet(from);
+ TRACE_OUTPUT(ifp, from, newsize);
+ if (ftrace) {
+ fprintf(ftrace,
+ "request arrived on interface %s\n",
+ ifp->int_name);
+ }
}
return;
rt->rt_timer = 0;
return;
}
- /* update timer for interface on which the packet arrived */
- if ((rt = rtfind(from)) && (rt->rt_state & RTS_INTERFACE))
+ /* Update timer for interface on which the packet arrived.
+ * If from other end of a point-to-point link that isn't
+ * in the routing tables, (re-)add the route.
+ */
+ if ((rt = rtfind(from)) && (rt->rt_state & RTS_INTERFACE)) {
+ if(ftrace) fprintf(ftrace, "Got route\n");
rt->rt_timer = 0;
+ } else if (ifp = if_ifwithdstaddr(from)) {
+ if(ftrace) fprintf(ftrace, "Got partner\n");
+ addrouteforif(ifp);
+ }
for (; size > 0; size -= sizeof (struct netinfo), n++) {
+ struct sockaddr *sa;
if (size < sizeof (struct netinfo))
break;
- if ((unsigned) ntohs(n->rip_metric) > HOPCNT_INFINITY)
+ if ((unsigned) ntohs(n->rip_metric) >= HOPCNT_INFINITY)
continue;
- rt = rtfind(xns_nettosa(n->rip_dst));
+ rt = rtfind(sa = xns_nettosa(n->rip_dst));
if (rt == 0) {
- rtadd(xns_nettosa(n->rip_dst), from, ntohs(n->rip_metric), 0);
+ rtadd(sa, from, ntohs(n->rip_metric), 0);
continue;
}