Browse Source

refactor(nfq): wrap TAILQ head for compatibility

Co-authored-by: vemneyy <[email protected]>
pull/2093/head
copilot-swe-agent[bot] 4 months ago
parent
commit
ffd4c99066
  1. 10
      nfq/packet_queue.c
  2. 4
      nfq/packet_queue.h

10
nfq/packet_queue.c

@ -6,7 +6,7 @@
void rawpacket_queue_init(struct rawpacket_tailhead *q) void rawpacket_queue_init(struct rawpacket_tailhead *q)
{ {
TAILQ_INIT(q); TAILQ_INIT(&q->head);
q->cached_count = 0; q->cached_count = 0;
} }
void rawpacket_free(struct rawpacket *rp) void rawpacket_free(struct rawpacket *rp)
@ -17,10 +17,10 @@ void rawpacket_free(struct rawpacket *rp)
struct rawpacket *rawpacket_dequeue(struct rawpacket_tailhead *q) struct rawpacket *rawpacket_dequeue(struct rawpacket_tailhead *q)
{ {
struct rawpacket *rp; struct rawpacket *rp;
rp = TAILQ_FIRST(q); rp = TAILQ_FIRST(&q->head);
if (rp) if (rp)
{ {
TAILQ_REMOVE(q, rp, next); TAILQ_REMOVE(&q->head, rp, next);
q->cached_count--; q->cached_count--;
} }
return rp; return rp;
@ -57,7 +57,7 @@ struct rawpacket *rawpacket_queue(struct rawpacket_tailhead *q,const struct sock
rp->len=len; rp->len=len;
rp->len_payload=len_payload; rp->len_payload=len_payload;
TAILQ_INSERT_TAIL(q, rp, next); TAILQ_INSERT_TAIL(&q->head, rp, next);
q->cached_count++; q->cached_count++;
return rp; return rp;
@ -69,5 +69,5 @@ unsigned int rawpacket_queue_count(const struct rawpacket_tailhead *q)
} }
bool rawpacket_queue_empty(const struct rawpacket_tailhead *q) bool rawpacket_queue_empty(const struct rawpacket_tailhead *q)
{ {
return !TAILQ_FIRST(q); return !TAILQ_FIRST(&q->head);
} }

4
nfq/packet_queue.h

@ -15,9 +15,9 @@ struct rawpacket
uint8_t *packet; uint8_t *packet;
TAILQ_ENTRY(rawpacket) next; TAILQ_ENTRY(rawpacket) next;
}; };
TAILQ_HEAD(rawpacket_tailq, rawpacket);
struct rawpacket_tailhead { struct rawpacket_tailhead {
struct rawpacket *tqh_first; struct rawpacket_tailq head;
struct rawpacket **tqh_last;
unsigned int cached_count; unsigned int cached_count;
}; };

Loading…
Cancel
Save