Skip to content

Commit 8120672

Browse files
fix: Remove unnecessary ACK
1 parent c72cd34 commit 8120672

1 file changed

Lines changed: 0 additions & 52 deletions

File tree

src/rawsend.c

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -78,46 +78,6 @@ static void ipaddr_to_str(struct sockaddr *addr, char ipstr[INET6_ADDRSTRLEN])
7878
}
7979

8080

81-
static int send_ack(struct sockaddr_ll *sll, struct sockaddr *saddr,
82-
struct sockaddr *daddr, uint8_t ttl, uint16_t sport_be,
83-
uint16_t dport_be, uint32_t seq_be, uint32_t ackseq_be)
84-
{
85-
int pkt_len;
86-
ssize_t nbytes;
87-
uint8_t pkt_buff[1600] __attribute__((aligned));
88-
89-
if (daddr->sa_family == AF_INET) {
90-
pkt_len = fh_pkt4_make(pkt_buff, sizeof(pkt_buff), saddr, daddr, ttl,
91-
sport_be, dport_be, seq_be, ackseq_be, 0, NULL,
92-
0);
93-
if (pkt_len < 0) {
94-
E(T(fh_pkt4_make));
95-
return -1;
96-
}
97-
} else if (daddr->sa_family == AF_INET6) {
98-
pkt_len = fh_pkt6_make(pkt_buff, sizeof(pkt_buff), saddr, daddr, ttl,
99-
sport_be, dport_be, seq_be, ackseq_be, 0, NULL,
100-
0);
101-
if (pkt_len < 0) {
102-
E(T(fh_pkt6_make));
103-
return -1;
104-
}
105-
} else {
106-
E("ERROR: Unknown address family: %d", (int) daddr->sa_family);
107-
return -1;
108-
}
109-
110-
nbytes = sendto(sockfd, pkt_buff, pkt_len, 0, (struct sockaddr *) sll,
111-
sizeof(*sll));
112-
if (nbytes < 0) {
113-
E("ERROR: sendto(): %s", strerror(errno));
114-
return -1;
115-
}
116-
117-
return 0;
118-
}
119-
120-
12181
static int send_payload(struct sockaddr_ll *sll, struct sockaddr *saddr,
12282
struct sockaddr *daddr, uint8_t ttl, uint16_t sport_be,
12383
uint16_t dport_be, uint32_t seq_be, uint32_t ackseq_be)
@@ -294,18 +254,6 @@ int fh_rawsend_handle(struct sockaddr_ll *sll, uint8_t *pkt_data, int pkt_len)
294254
ack_new++;
295255
ack_new = htonl(ack_new);
296256

297-
for (i = 0; i < g_ctx.repeat; i++) {
298-
res = send_ack(sll, daddr, saddr, snd_ttl, tcph->dest,
299-
tcph->source, tcph->ack_seq, ack_new);
300-
if (res < 0) {
301-
E(T(send_ack));
302-
return -1;
303-
}
304-
}
305-
E_INFO("%s:%u <===ACK(*)=== %s:%u", src_ip, ntohs(tcph->source),
306-
dst_ip, ntohs(tcph->dest));
307-
308-
309257
th_payload_get(&payload, &payload_len);
310258
for (i = 0; i < g_ctx.repeat; i++) {
311259
res = send_payload(sll, daddr, saddr, snd_ttl, tcph->dest,

0 commit comments

Comments
 (0)