From: James Jones Date: Wed, 23 Aug 2023 18:50:32 +0000 (-0500) Subject: Rename fr_dhcv4_raw_packet_recv() as fr_dhcpv4_raw_packet_recv() X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90a81ca49a424a3af136295fed1c0b41e7ba021e;p=thirdparty%2Ffreeradius-server.git Rename fr_dhcv4_raw_packet_recv() as fr_dhcpv4_raw_packet_recv() --- diff --git a/src/bin/dhcpclient.c b/src/bin/dhcpclient.c index c045fde6211..b6647932882 100644 --- a/src/bin/dhcpclient.c +++ b/src/bin/dhcpclient.c @@ -278,7 +278,7 @@ static fr_radius_packet_t *fr_dhcpv4_recv_raw_loop(int lsockfd, /* There is something to read on our socket */ #ifdef HAVE_LINUX_IF_PACKET_H - reply = fr_dhcv4_raw_packet_recv(lsockfd, p_ll, request, request_list); + reply = fr_dhcpv4_raw_packet_recv(lsockfd, p_ll, request, request_list); #else # ifdef HAVE_LIBPCAP reply = fr_dhcpv4_pcap_recv(pcap); diff --git a/src/protocols/dhcpv4/dhcpv4.h b/src/protocols/dhcpv4/dhcpv4.h index 0cb08aeaa3f..9d575609125 100644 --- a/src/protocols/dhcpv4/dhcpv4.h +++ b/src/protocols/dhcpv4/dhcpv4.h @@ -201,7 +201,7 @@ int fr_dhcpv4_raw_socket_open(struct sockaddr_ll *p_ll, int iface_index); int fr_dhcpv4_raw_packet_send(int sockfd, struct sockaddr_ll *p_ll, fr_radius_packet_t *packet, fr_pair_list_t *list); -fr_radius_packet_t *fr_dhcv4_raw_packet_recv(int sockfd, struct sockaddr_ll *p_ll, +fr_radius_packet_t *fr_dhcpv4_raw_packet_recv(int sockfd, struct sockaddr_ll *p_ll, fr_radius_packet_t *request, fr_pair_list_t *list); #endif diff --git a/src/protocols/dhcpv4/raw.c b/src/protocols/dhcpv4/raw.c index d3567185452..7b8cd756637 100644 --- a/src/protocols/dhcpv4/raw.c +++ b/src/protocols/dhcpv4/raw.c @@ -166,7 +166,7 @@ int fr_dhcpv4_raw_packet_send(int sockfd, struct sockaddr_ll *link_layer, * * FIXME: split this into two, recv_raw_packet, and verify(packet, original) */ -fr_radius_packet_t *fr_dhcv4_raw_packet_recv(int sockfd, struct sockaddr_ll *link_layer, +fr_radius_packet_t *fr_dhcpv4_raw_packet_recv(int sockfd, struct sockaddr_ll *link_layer, fr_radius_packet_t *request, fr_pair_list_t *list) { fr_pair_t *vp;