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

udhcpc6: fix sending of renew messages

Browse Source 
function                                             old     new   delta
d6_listen_socket                                       -     150    +150

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2022-08-02 15:33:51 +02:00
parent 3147552a23
commit 75aaa8b311
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
networking/udhcp/d6_dhcpc.c
View File

@ -844,7 +844,7 @@ static NOINLINE int send_d6_renew(struct in6_addr *server_ipv6, struct in6_addr
uint8_t *opt_ptr; uint8_t *opt_ptr;
/* Fill in: msg type, xid, ELAPSED_TIME */ /* Fill in: msg type, xid, ELAPSED_TIME */
opt_ptr = init_d6_packet(&packet, DHCPREQUEST); opt_ptr = init_d6_packet(&packet, D6_MSG_RENEW);
/* server id */ /* server id */
opt_ptr = mempcpy(opt_ptr, client6_data.server_id, client6_data.server_id->len + 2+2); opt_ptr = mempcpy(opt_ptr, client6_data.server_id, client6_data.server_id->len + 2+2);
@ -1083,7 +1083,7 @@ static void change_listen_mode(int new_mode)
client_data.sockfd = -1; client_data.sockfd = -1;
} }
if (new_mode == LISTEN_KERNEL) if (new_mode == LISTEN_KERNEL)
client_data.sockfd = udhcp_listen_socket(/*INADDR_ANY,*/ CLIENT_PORT6, client_data.interface); client_data.sockfd = d6_listen_socket(/*INADDR_ANY,*/ CLIENT_PORT6, client_data.interface);
else if (new_mode != LISTEN_NONE) else if (new_mode != LISTEN_NONE)
client_data.sockfd = d6_raw_socket(client_data.ifindex); client_data.sockfd = d6_raw_socket(client_data.ifindex);
/* else LISTEN_NONE: client_data.sockfd stays closed */ /* else LISTEN_NONE: client_data.sockfd stays closed */
@ -1489,6 +1489,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
if (opt & OPT_l) if (opt & OPT_l)
send_d6_info_request(); send_d6_info_request();
else /* send a broadcast renew request */ else /* send a broadcast renew request */
//TODO: send_d6_renew uses D6_MSG_RENEW message, should we use D6_MSG_REBIND here instead?
send_d6_renew(/*server_ipv6:*/ NULL, requested_ipv6); send_d6_renew(/*server_ipv6:*/ NULL, requested_ipv6);
timeout = discover_timeout; timeout = discover_timeout;
packet_num++; packet_num++;