diff options
| author | Alex Harpin <development@landsofshadow.co.uk> | 2015-11-25 18:50:37 +0000 |
|---|---|---|
| committer | Alex Harpin <development@landsofshadow.co.uk> | 2015-11-25 18:50:37 +0000 |
| commit | 04a362036d1d1b97e2c6560d431e73f14b269007 (patch) | |
| tree | c540572d2078af88bc304b6f5ebd3e0f5848a2d7 /include/network.h | |
| parent | 0049da2e13635a50d6d3324da19dcded340c3074 (diff) | |
| parent | fbe3181be4f2e33509b1c20b95fd55eb3e7075d7 (diff) | |
| download | conntrack-tools-04a362036d1d1b97e2c6560d431e73f14b269007.tar.gz conntrack-tools-04a362036d1d1b97e2c6560d431e73f14b269007.zip | |
Merge tag 'conntrack-tools-1.4.2' into lithium
conntrack-tools 1.4.2 release
Diffstat (limited to 'include/network.h')
| -rw-r--r-- | include/network.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/include/network.h b/include/network.h index 41c35af..cc312cb 100644 --- a/include/network.h +++ b/include/network.h @@ -173,18 +173,6 @@ static inline int between(uint32_t seq1, uint32_t seq2, uint32_t seq3) return seq3 - seq2 >= seq1 - seq2; } -#define PLD_NETWORK2HOST(x) \ -({ \ - x->len = ntohs(x->len); \ - x->query = ntohs(x->query); \ -}) - -#define PLD_HOST2NETWORK(x) \ -({ \ - x->len = htons(x->len); \ - x->query = htons(x->query); \ -}) - struct netattr { uint16_t nta_len; uint16_t nta_attr; @@ -240,9 +228,13 @@ enum nta_attr { NTA_TCP_WSCALE_ORIG, /* uint8_t */ NTA_TCP_WSCALE_REPL, /* uint8_t */ NTA_HELPER_NAME, /* string (variable length) */ + NTA_LABELS, /* array of uint32_t (variable length) */ NTA_MAX }; +/* allow to serialize/replicate up to 4k labels per flow */ +#define NTA_LABELS_MAX_SIZE (4096/sizeof(uint32_t)) + struct nta_attr_natseqadj { uint32_t orig_seq_correction_pos; uint32_t orig_seq_offset_before; |