emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dhcpc.c: Added support for relay server parameter.

Browse Source 
Resolved a TODO by adding support for gateway_nip parameter.

function                                             old     new   delta
udhcp_run_script                                     792     835     +43

Signed-off-by: Martin Lewis <martin.lewis.x84@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Martin Lewis 2019-06-10 17:06:17 +02:00 committed by Denys Vlasenko
parent eda5142b5c
commit d378fa170a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
networking/udhcp/dhcpc.c
View File

@ -449,15 +449,16 @@ static char **fill_envp(struct dhcp_packet *packet)
memset(found_opts, 0, sizeof(found_opts)); memset(found_opts, 0, sizeof(found_opts));
/* We need 6 elements for: /* We need 7 elements for:
* "interface=IFACE" * "interface=IFACE"
* "ip=N.N.N.N" from packet->yiaddr * "ip=N.N.N.N" from packet->yiaddr
* "giaddr=IP" from packet->gateway_nip (unless 0)
* "siaddr=IP" from packet->siaddr_nip (unless 0) * "siaddr=IP" from packet->siaddr_nip (unless 0)
* "boot_file=FILE" from packet->file (unless overloaded) * "boot_file=FILE" from packet->file (unless overloaded)
* "sname=SERVER_HOSTNAME" from packet->sname (unless overloaded) * "sname=SERVER_HOSTNAME" from packet->sname (unless overloaded)
* terminating NULL * terminating NULL
*/ */
envc = 6; envc = 7;
/* +1 element for each option, +2 for subnet option: */ /* +1 element for each option, +2 for subnet option: */
if (packet) { if (packet) {
/* note: do not search for "pad" (0) and "end" (255) options */ /* note: do not search for "pad" (0) and "end" (255) options */
@ -493,9 +494,7 @@ static char **fill_envp(struct dhcp_packet *packet)
* uint16_t flags; // only one flag so far: bcast. Never set by server * uint16_t flags; // only one flag so far: bcast. Never set by server
* uint32_t ciaddr; // client IP (usually == yiaddr. can it be different * uint32_t ciaddr; // client IP (usually == yiaddr. can it be different
* // if during renew server wants to give us different IP?) * // if during renew server wants to give us different IP?)
* uint32_t gateway_nip; // relay agent IP address
* uint8_t chaddr[16]; // link-layer client hardware address (MAC) * uint8_t chaddr[16]; // link-layer client hardware address (MAC)
* TODO: export gateway_nip as $giaddr?
*/ */
/* Most important one: yiaddr as $ip */ /* Most important one: yiaddr as $ip */
*curr = xmalloc(sizeof("ip=255.255.255.255")); *curr = xmalloc(sizeof("ip=255.255.255.255"));
@ -507,6 +506,12 @@ static char **fill_envp(struct dhcp_packet *packet)
sprint_nip(*curr, "siaddr=", (uint8_t *) &packet->siaddr_nip); sprint_nip(*curr, "siaddr=", (uint8_t *) &packet->siaddr_nip);
putenv(*curr++); putenv(*curr++);
} }
if (packet->gateway_nip) {
/* IP address of DHCP relay agent to use in bootstrap */
*curr = xmalloc(sizeof("giaddr=255.255.255.255"));
sprint_nip(*curr, "giaddr=", (uint8_t *) &packet->gateway_nip);
putenv(*curr++);
}
if (!(overload & FILE_FIELD) && packet->file[0]) { if (!(overload & FILE_FIELD) && packet->file[0]) {
/* watch out for invalid packets */ /* watch out for invalid packets */
*curr = xasprintf("boot_file=%."DHCP_PKT_FILE_LEN_STR"s", packet->file); *curr = xasprintf("boot_file=%."DHCP_PKT_FILE_LEN_STR"s", packet->file);