From c5bcd787a6a5e4c73d125ed5585bdc145e2a1958 Mon Sep 17 00:00:00 2001 From: Duncan Roe Date: Tue, 31 Dec 2019 22:03:07 +1100 Subject: src: Always use pktb as formal arg of type struct pkt_buff All remaining instances of pkt refer to something other than a pkt_buff. In the prototype for nfq_nlmsg_parse, pkt is changed to attr. Inconsistent whitespace in headers has been left for another day. Signed-off-by: Duncan Roe Signed-off-by: Florian Westphal --- src/extra/pktbuff.c | 14 +++++++------- src/extra/tcp.c | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/extra/pktbuff.c b/src/extra/pktbuff.c index 6250fbf..37f6bc0 100644 --- a/src/extra/pktbuff.c +++ b/src/extra/pktbuff.c @@ -271,26 +271,26 @@ uint8_t *pktb_transport_header(struct pkt_buff *pktb) * @} */ -static int pktb_expand_tail(struct pkt_buff *pkt, int extra) +static int pktb_expand_tail(struct pkt_buff *pktb, int extra) { /* No room in packet, cannot mangle it. We don't support dynamic * reallocation. Instead, increase the size of the extra room in * the tail in pktb_alloc. */ - if (pkt->len + extra > pkt->data_len) + if (pktb->len + extra > pktb->data_len) return 0; - pkt->len += extra; - pkt->tail = pkt->tail + extra; + pktb->len += extra; + pktb->tail = pktb->tail + extra; return 1; } -static int enlarge_pkt(struct pkt_buff *pkt, unsigned int extra) +static int enlarge_pkt(struct pkt_buff *pktb, unsigned int extra) { - if (pkt->len + extra > 65535) + if (pktb->len + extra > 65535) return 0; - if (!pktb_expand_tail(pkt, extra - pktb_tailroom(pkt))) + if (!pktb_expand_tail(pktb, extra - pktb_tailroom(pktb))) return 0; return 1; diff --git a/src/extra/tcp.c b/src/extra/tcp.c index 64ab85f..0f83500 100644 --- a/src/extra/tcp.c +++ b/src/extra/tcp.c @@ -188,17 +188,17 @@ int nfq_tcp_snprintf(char *buf, size_t size, const struct tcphdr *tcph) * \note This function recalculates the IPv4 and TCP checksums for you. */ EXPORT_SYMBOL -int nfq_tcp_mangle_ipv4(struct pkt_buff *pkt, +int nfq_tcp_mangle_ipv4(struct pkt_buff *pktb, unsigned int match_offset, unsigned int match_len, const char *rep_buffer, unsigned int rep_len) { struct iphdr *iph; struct tcphdr *tcph; - iph = (struct iphdr *)pkt->network_header; - tcph = (struct tcphdr *)(pkt->network_header + iph->ihl*4); + iph = (struct iphdr *)pktb->network_header; + tcph = (struct tcphdr *)(pktb->network_header + iph->ihl*4); - if (!nfq_ip_mangle(pkt, iph->ihl*4 + tcph->doff*4, + if (!nfq_ip_mangle(pktb, iph->ihl*4 + tcph->doff*4, match_offset, match_len, rep_buffer, rep_len)) return 0; -- cgit v1.2.3