mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-02 07:15:44 +00:00
Code Issues Releases Wiki Activity

Add HAVE_SIN_LEN; encase debugging statements in ifdef DEBUG; fix destination port botch

Browse Source
This commit is contained in:
Ted Lemon
1996-03-06 10:40:08 +00:00
parent 8e3de495cb
commit be1b6e8227
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dhcp.c
View File

@@ -249,7 +249,9 @@ void nak_lease (packet)
} }
to.sin_family = AF_INET; to.sin_family = AF_INET;
#ifdef HAVE_SIN_LEN
to.sin_len = sizeof to; to.sin_len = sizeof to;
#endif
memset (to.sin_zero, 0, sizeof to.sin_zero); memset (to.sin_zero, 0, sizeof to.sin_zero);
note ("Sending dhcp NAK to %s, port %d", note ("Sending dhcp NAK to %s, port %d",
@@ -261,7 +263,7 @@ void nak_lease (packet)
if (result < 0) if (result < 0)
warn ("sendto: %m"); warn ("sendto: %m");
#if 0 #ifdef DEBUG
dump_packet (packet); dump_packet (packet);
dump_raw ((unsigned char *)packet -> raw, packet -> packet_length); dump_raw ((unsigned char *)packet -> raw, packet -> packet_length);
dump_packet (&outgoing); dump_packet (&outgoing);
@@ -510,9 +512,10 @@ void ack_lease (packet, lease, offer, when)
to.sin_port = htons (ntohs (server_port) + 1); /* XXX */ to.sin_port = htons (ntohs (server_port) + 1); /* XXX */
} }
to.sin_port = htons (ntohs (server_port) + 1); /* XXX */
to.sin_family = AF_INET; to.sin_family = AF_INET;
#ifdef HAVE_SIN_LEN
to.sin_len = sizeof to; to.sin_len = sizeof to;
#endif
memset (to.sin_zero, 0, sizeof to.sin_zero); memset (to.sin_zero, 0, sizeof to.sin_zero);
note ("Sending dhcp reply to %s, port %d", note ("Sending dhcp reply to %s, port %d",
@@ -524,7 +527,7 @@ void ack_lease (packet, lease, offer, when)
if (result < 0) if (result < 0)
warn ("sendto: %m"); warn ("sendto: %m");
#if 0 #ifdef DEBUG
dump_packet (packet); dump_packet (packet);
dump_raw ((unsigned char *)packet -> raw, packet -> packet_length); dump_raw ((unsigned char *)packet -> raw, packet -> packet_length);
dump_packet (&outgoing); dump_packet (&outgoing);

9
server/dhcp.c
View File

@@ -249,7 +249,9 @@ void nak_lease (packet)
} }
to.sin_family = AF_INET; to.sin_family = AF_INET;
#ifdef HAVE_SIN_LEN
to.sin_len = sizeof to; to.sin_len = sizeof to;
#endif
memset (to.sin_zero, 0, sizeof to.sin_zero); memset (to.sin_zero, 0, sizeof to.sin_zero);
note ("Sending dhcp NAK to %s, port %d", note ("Sending dhcp NAK to %s, port %d",
@@ -261,7 +263,7 @@ void nak_lease (packet)
if (result < 0) if (result < 0)
warn ("sendto: %m"); warn ("sendto: %m");
#if 0 #ifdef DEBUG
dump_packet (packet); dump_packet (packet);
dump_raw ((unsigned char *)packet -> raw, packet -> packet_length); dump_raw ((unsigned char *)packet -> raw, packet -> packet_length);
dump_packet (&outgoing); dump_packet (&outgoing);
@@ -510,9 +512,10 @@ void ack_lease (packet, lease, offer, when)
to.sin_port = htons (ntohs (server_port) + 1); /* XXX */ to.sin_port = htons (ntohs (server_port) + 1); /* XXX */
} }
to.sin_port = htons (ntohs (server_port) + 1); /* XXX */
to.sin_family = AF_INET; to.sin_family = AF_INET;
#ifdef HAVE_SIN_LEN
to.sin_len = sizeof to; to.sin_len = sizeof to;
#endif
memset (to.sin_zero, 0, sizeof to.sin_zero); memset (to.sin_zero, 0, sizeof to.sin_zero);
note ("Sending dhcp reply to %s, port %d", note ("Sending dhcp reply to %s, port %d",
@@ -524,7 +527,7 @@ void ack_lease (packet, lease, offer, when)
if (result < 0) if (result < 0)
warn ("sendto: %m"); warn ("sendto: %m");
#if 0 #ifdef DEBUG
dump_packet (packet); dump_packet (packet);
dump_raw ((unsigned char *)packet -> raw, packet -> packet_length); dump_raw ((unsigned char *)packet -> raw, packet -> packet_length);
dump_packet (&outgoing); dump_packet (&outgoing);