nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-12 16:47:42 -05:00
Code Issues Projects Releases Wiki Activity

Make pq_empty_on_to_front_of more general.

Browse Source 
It's really just a concatenator for a pair of linked lists, but
unhelpfully restricted in which of the lists it replaces with the
output. Better to have a three-argument function that puts the output
wherever you like, whether it overlaps either or neither one of the
inputs.
This commit is contained in:
Simon Tatham
2018-09-19 20:30:40 +01:00
parent 04226693e3
commit 6a5d4d083a
3 changed files with 66 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ssh.h
View File

@ -102,7 +102,8 @@ typedef struct PktOutQueue {
void pq_base_init(PacketQueueBase *pqb);
void pq_base_push(PacketQueueBase *pqb, PacketQueueNode *node);
void pq_base_push_front(PacketQueueBase *pqb, PacketQueueNode *node);
int pq_base_empty_on_to_front_of(PacketQueueBase *src, PacketQueueBase *dest);
void pq_base_concatenate(PacketQueueBase *dest,
PacketQueueBase *q1, PacketQueueBase *q2);
void pq_in_init(PktInQueue *pq);
void pq_out_init(PktOutQueue *pq);
@ -117,10 +118,12 @@ void pq_out_clear(PktOutQueue *pq);
pq_base_push_front(&(pq)->pqb, &(pkt)->qnode))
#define pq_peek(pq) ((pq)->get(&(pq)->pqb, FALSE))
#define pq_pop(pq) ((pq)->get(&(pq)->pqb, TRUE))
#define pq_empty_on_to_front_of(src, dst) \
TYPECHECK((src)->get(&(src)->pqb, FALSE) == \
#define pq_concatenate(dst, q1, q2) \
TYPECHECK((q1)->get(&(q1)->pqb, FALSE) == \
(dst)->get(&(dst)->pqb, FALSE) && \
(q2)->get(&(q2)->pqb, FALSE) == \
(dst)->get(&(dst)->pqb, FALSE), \
pq_base_empty_on_to_front_of(&(src)->pqb, &(dst)->pqb))
pq_base_concatenate(&(dst)->pqb, &(q1)->pqb, &(q2)->pqb))
/*
* Packet type contexts, so that ssh2_pkt_type can correctly decode