From eaf98d78f8b916d925e19cc16ce8379ac834ae11 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Thu, 12 Mar 2020 21:14:36 +0100 Subject: moved header byte-re-ordering code into a subroutine Signed-off-by: Toni Uhlig --- src/pkt.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/pkt.c b/src/pkt.c index 2ea8cff..e2c88c8 100644 --- a/src/pkt.c +++ b/src/pkt.c @@ -188,6 +188,16 @@ static void handle_auth_response(unsigned bytes, int icmp_sock, } } +static void header_byteorder_ntoh(icmp_echo_packet_t * const icmp_pkt, + ping_tunnel_pkt_t * const pt_pkt) +{ + pt_pkt->state = ntohl(pt_pkt->state); + icmp_pkt->identifier = ntohs(icmp_pkt->identifier); + icmp_pkt->seq = ntohs(icmp_pkt->seq); + pt_pkt->id_no = ntohs(pt_pkt->id_no); + pt_pkt->seq_no = ntohs(pt_pkt->seq_no); +} + static proxy_desc_t * get_proxy_descriptor(uint16_t id_no) { proxy_desc_t * cur; @@ -241,12 +251,7 @@ void handle_packet(char * buf, unsigned bytes, int is_pcap, struct sockaddr_in * } if (ntohl(pt_pkt->magic) == opts.magic) { - pt_pkt->state = ntohl(pt_pkt->state); - pkt->identifier = ntohs(pkt->identifier); - pkt->seq = ntohs(pkt->seq); - pt_pkt->id_no = ntohs(pt_pkt->id_no); - pt_pkt->seq_no = ntohs(pt_pkt->seq_no); - + header_byteorder_ntoh(pkt, pt_pkt); cur = get_proxy_descriptor(pt_pkt->id_no); /* Handle the packet if it comes from "the other end." This is a bit tricky -- cgit v1.2.3