Update of /cvsroot/linux-decnet/dnprogs/dnroute
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15826
Modified Files:
get_neigh.c send_route.c
Log Message:
We don't need to split packets up into 32s...do we ?
Index: get_neigh.c
===================================================================
RCS file: /cvsroot/linux-decnet/dnprogs/dnroute/get_neigh.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** get_neigh.c 5 Apr 2006 14:23:01 -0000 1.10
--- get_neigh.c 6 Apr 2006 10:46:52 -0000 1.11
***************
*** 1085,1089 ****
{
struct sockaddr_ll sll;
! int sll_len = sizeof(sll);
len = recvfrom(dnet_socket, buf, sizeof(buf), 0, (struct sockaddr *)&sll, &sll_len);
if (len > 0)
--- 1085,1089 ----
{
struct sockaddr_ll sll;
! unsigned int sll_len = sizeof(sll);
len = recvfrom(dnet_socket, buf, sizeof(buf), 0, (struct sockaddr *)&sll, &sll_len);
if (len > 0)
Index: send_route.c
===================================================================
RCS file: /cvsroot/linux-decnet/dnprogs/dnroute/send_route.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** send_route.c 5 Apr 2006 14:23:01 -0000 1.7
--- send_route.c 6 Apr 2006 10:46:52 -0000 1.8
***************
*** 1,4 ****
/*
! * dnroute.c DECnet routing daemon (eventually...)
*
* This program is free software; you can redistribute it and/or
--- 1,4 ----
/*
! * send_route.c DECnet routing daemon
*
* This program is free software; you can redistribute it and/or
***************
*** 8,12 ****
*
* Authors: Patrick Caulfield <pa...@de...>
- * based on rtmon.c by Alexey Kuznetsov, <ku...@ms...>
*
*/
--- 8,11 ----
***************
*** 60,65 ****
int i,j;
- assert (!((start-end) & 0x1F));
-
fprintf(stderr,"Sending message type %d. start=%d, end=%d\n", type,start,end);
--- 59,62 ----
***************
*** 74,87 ****
packet[i++] = 0x00; /* Reserved */
! /* Do the nodes in blocks of 32 */
for (j=start; j<end; j++)
{
- if ( !(j & 0x3F))
- {
- packet[i++] = 32;
- packet[i++] = 0;
- packet[i++] = j&0xFF;
- packet[i++] = j>>8;
- }
if (node_table[j].valid)
{
--- 71,83 ----
packet[i++] = 0x00; /* Reserved */
!
! /* Header */
! packet[i++] = (end-start) & 0xFF;
! packet[i++] = (end-start) >> 8;
! packet[i++] = start & 0xFF;
! packet[i++] = start >> 8;
!
for (j=start; j<end; j++)
{
if (node_table[j].valid)
{
***************
*** 126,130 ****
}
! static void send_route_msg(unsigned char type, struct routeinfo *node_table, int num)
{
struct ifreq ifr;
--- 122,126 ----
}
! static void send_route_msg(unsigned char type, struct routeinfo *node_table, int start, int num)
{
struct ifreq ifr;
***************
*** 153,157 ****
int num_nodes;
! last_node = 0;
ioctl(sock, SIOCGIFMTU, &ifr);
--- 149,153 ----
int num_nodes;
! last_node = start;
ioctl(sock, SIOCGIFMTU, &ifr);
***************
*** 184,192 ****
void send_level1_msg(struct routeinfo *node_table)
{
! send_route_msg(0x07, node_table, 1024);
}
void send_level2_msg(struct routeinfo *area_table)
{
! send_route_msg(0x09, area_table, 64);
}
--- 180,188 ----
void send_level1_msg(struct routeinfo *node_table)
{
! send_route_msg(0x07, node_table, 0, 1023);
}
void send_level2_msg(struct routeinfo *area_table)
{
! send_route_msg(0x09, area_table, 1, 64);
}
|