sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

ctdb-common: Clean up types/declarations in TCP socket reading

Browse Source 
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-08-17 14:35:07 +10:00 committed by Amitay Isaacs
parent cb4848e359
commit 028fdc12e7
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ctdb/common/system_socket.c
View File

@ -789,16 +789,16 @@ int ctdb_sys_read_tcp_packet(int s, void *private_data,
int *rst,
uint16_t *window)
{
int ret;
#define RCVPKTSIZE 100
char pkt[RCVPKTSIZE];
ssize_t nread;
uint8_t pkt[100]; /* Large enough for simple ACK/RST packets */
struct ether_header *eth;
struct iphdr *ip;
struct ip6_hdr *ip6;
struct tcphdr *tcp;
int ret;
ret = recv(s, pkt, RCVPKTSIZE, MSG_TRUNC);
if (ret < sizeof(*eth)+sizeof(*ip)) {
nread = recv(s, pkt, sizeof(pkt), MSG_TRUNC);
if (nread < sizeof(*eth)+sizeof(*ip)) {
return EMSGSIZE;
}
@ -828,7 +828,7 @@ int ctdb_sys_read_tcp_packet(int s, void *private_data,
/* make sure its not a short packet */
if (offsetof(struct tcphdr, th_ack) + 4 +
(ip->ihl*4) + sizeof(*eth) > ret) {
(ip->ihl*4) + sizeof(*eth) > nread) {
return EMSGSIZE;
}
/* TCP */
@ -926,7 +926,6 @@ int ctdb_sys_read_tcp_packet(int s,
struct ip *ip;
struct ip6_hdr *ip6;
struct tcphdr *tcp;
struct ctdb_killtcp_connection *conn;
struct pcap_pkthdr pkthdr;
const u_char *buffer;
pcap_t *pt = (pcap_t *)private_data;