Preston_PLB
/
sngrep
forked from Mirrors/sngrep
1
0
Fork 0
Code Pull Requests Activity

fix recvfrom() call in capture_eep_receive_v*() 

- the addrlen parameter must be filled with the size available for src_addr before
  calling recvfrom()
- the size of the src_addr isn't really known before calling recvfrom, it can be
  of different types. So use struct sockaddr_storage for it which is large enough
  to allow different actual address types
This commit is contained in:
Gerd v. Egidy 2022-05-07 16:43:23 +02:00 committed by Kaian
parent ffe39e7218
commit f64df86647
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/capture_eep.c
View File

@ -595,8 +595,8 @@ capture_eep_receive_v2()
//! New created packet pointer
packet_t *pkt;
//! EEP client data
struct sockaddr eep_client;
socklen_t eep_client_len;
struct sockaddr_storage eep_client;
socklen_t eep_client_len=sizeof(eep_client);
struct hep_hdr hdr;
struct hep_timehdr hep_time;
struct hep_iphdr hep_ipheader;
@ -611,7 +611,7 @@ capture_eep_receive_v2()
memset(buffer, 0, MAX_CAPTURE_LEN);
/* Receive EEP generic header */
if (recvfrom(eep_cfg.server_sock, buffer, MAX_CAPTURE_LEN, 0, &eep_client, &eep_client_len) == -1)
if (recvfrom(eep_cfg.server_sock, buffer, MAX_CAPTURE_LEN, 0, (struct sockaddr*)&eep_client, &eep_client_len) == -1)
return NULL;
/* Copy initial bytes to HEPv2 header */
@ -716,8 +716,8 @@ capture_eep_receive_v3(const u_char *pkt, uint32_t size)
//! Source and Destination Address
address_t src, dst;
//! EEP client data
struct sockaddr eep_client;
socklen_t eep_client_len;
struct sockaddr_storage eep_client;
socklen_t eep_client_len=sizeof(eep_client);
//! Packet header
struct pcap_pkthdr header;
//! New created packet pointer
@ -728,7 +728,7 @@ capture_eep_receive_v3(const u_char *pkt, uint32_t size)
if(!pkt) {
/* Receive EEP generic header */
if (recvfrom(eep_cfg.server_sock, buffer, MAX_CAPTURE_LEN, 0, &eep_client, &eep_client_len) == -1)
if (recvfrom(eep_cfg.server_sock, buffer, MAX_CAPTURE_LEN, 0, (struct sockaddr*)&eep_client, &eep_client_len) == -1)
return NULL;
} else {
memcpy(&buffer, pkt, size);