cmhi
/
vcpe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/libuv_dhcpd_dev' into libuv_dhcpd_dev 

# Conflicts:
#	dhcp_tools/detail_wnd.c
This commit is contained in:
黄昕 2023-05-05 15:30:20 +08:00
parent 99e1ec5cf9 cc622ebd68
commit 42de56ac4a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dhcp_tools/detail_wnd.c
View File

@ -285,7 +285,7 @@ static void create_dhcp_tree_mode(PDHCP_PACKAGE p, U32 nBytes, GtkWidget *treeVi
ADD_SUB_STRING("Relay agent IP address", inet_ntoa(*(struct in_addr *)&p->dhcp.giaddr)); ADD_SUB_STRING("Relay agent IP address", inet_ntoa(*(struct in_addr *)&p->dhcp.giaddr));
s = sdsempty(); s = sdsempty();
MAC_TO_STR(p->dhcp.chaddr, s); MAC_TO_STR(p->dhcp.chaddr, s);
ADD_SUB_STRING("Destination", s); ADD_SUB_STRING("Client MAC address", s);
sdsfree(s); sdsfree(s);
if (strlen((char *)p->dhcp.sname) != 0) { if (strlen((char *)p->dhcp.sname) != 0) {

1
srcs/service/dhcpd/dhcp_option.c
View File

@ -105,6 +105,7 @@ static const DHCP_OPTION_CFG g_opCfg[] = {
{"SubnetSelectionOption", OPT_SUBNETSELECTION, 3, TRUE }, {"SubnetSelectionOption", OPT_SUBNETSELECTION, 3, TRUE },
{"DomainSearch", OPT_DOMAINSEARCH, 1, TRUE }, {"DomainSearch", OPT_DOMAINSEARCH, 1, TRUE },
{"SIPServersDHCPOption", OPT_SIPSERVERSDHCP, 1, TRUE }, {"SIPServersDHCPOption", OPT_SIPSERVERSDHCP, 1, TRUE },
{"ClasslessStaticRoute", OPT_CLASSLESSSTATICROUTE, 1, TRUE },
{"CCC", OPT_CCC, 1, TRUE }, {"CCC", OPT_CCC, 1, TRUE },
{"TFTPServerIPaddress", OPT_TFPTSERVERIPADDRESS, 3, TRUE }, {"TFTPServerIPaddress", OPT_TFPTSERVERIPADDRESS, 3, TRUE },
{"CallServerIPaddress", OPT_CALLSERVERIPADDRESS, 3, TRUE }, {"CallServerIPaddress", OPT_CALLSERVERIPADDRESS, 3, TRUE },