projects
/
oweals
/
odhcpd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f41da55
)
dhcpv4: added more comments
author
Christian Mehlis
<christian@m3hlis.de>
Mon, 18 Aug 2014 11:35:16 +0000
(13:35 +0200)
committer
Christian Mehlis
<christian@m3hlis.de>
Mon, 18 Aug 2014 11:35:16 +0000
(13:35 +0200)
src/dhcpv4.c
patch
|
blob
|
history
diff --git
a/src/dhcpv4.c
b/src/dhcpv4.c
index 9b9b528d852cffceb9855310b9703ac440e012df..58838476d522b424f15654184c0397ad93c5cca1 100644
(file)
--- a/
src/dhcpv4.c
+++ b/
src/dhcpv4.c
@@
-439,16
+439,29
@@
static void handle_dhcpv4(void *addr, void *data, size_t len,
struct sockaddr_in dest = *((struct sockaddr_in*)addr);
if (req->giaddr.s_addr) {
struct sockaddr_in dest = *((struct sockaddr_in*)addr);
if (req->giaddr.s_addr) {
+ /*
+ * relay agent is configured, send reply to the agent
+ */
dest.sin_addr = req->giaddr;
dest.sin_port = htons(DHCPV4_SERVER_PORT);
} else if (req->ciaddr.s_addr && req->ciaddr.s_addr != dest.sin_addr.s_addr) {
dest.sin_addr = req->giaddr;
dest.sin_port = htons(DHCPV4_SERVER_PORT);
} else if (req->ciaddr.s_addr && req->ciaddr.s_addr != dest.sin_addr.s_addr) {
+ /*
+ * client has existing configuration (ciaddr is set) AND this address is
+ * not the address it used for the dhcp message
+ */
dest.sin_addr = req->ciaddr;
dest.sin_port = htons(DHCPV4_CLIENT_PORT);
} else if ((ntohs(req->flags) & DHCPV4_FLAG_BROADCAST) ||
req->hlen != reply.hlen || !reply.yiaddr.s_addr) {
dest.sin_addr = req->ciaddr;
dest.sin_port = htons(DHCPV4_CLIENT_PORT);
} else if ((ntohs(req->flags) & DHCPV4_FLAG_BROADCAST) ||
req->hlen != reply.hlen || !reply.yiaddr.s_addr) {
+ /*
+ * client requests a broadcast reply OR we can't offer an IP
+ */
dest.sin_addr.s_addr = INADDR_BROADCAST;
dest.sin_port = htons(DHCPV4_CLIENT_PORT);
} else {
dest.sin_addr.s_addr = INADDR_BROADCAST;
dest.sin_port = htons(DHCPV4_CLIENT_PORT);
} else {
+ /*
+ * send reply to the newly (in this proccess) allocated IP
+ */
dest.sin_addr = reply.yiaddr;
dest.sin_port = htons(DHCPV4_CLIENT_PORT);
dest.sin_addr = reply.yiaddr;
dest.sin_port = htons(DHCPV4_CLIENT_PORT);