proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-05 06:34:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4576 from sarav511/enc_addr

Browse Source 
pimd: Fixing encoded group & source address packing in right byte order
This commit is contained in:
Donald Sharp 2019-06-21 08:21:03 -04:00 committed by GitHub
commit eb7fce2eea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pimd/pim_msg.h
View File

@ -66,9 +66,19 @@ struct pim_encoded_ipv4_unicast {
struct in_addr addr;
} __attribute__((packed));
/*
* Encoded Group format. RFC 4601 Sec 4.9.1
* 0 1 2 3
* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* | Addr Family | Encoding Type |B| Reserved |Z| Mask Len |
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* | Group multicast Address
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+...
*/
struct pim_encoded_group_ipv4 {
uint8_t ne;
uint8_t family;
uint8_t ne;
uint8_t bidir : 1; /* Bidir bit */
uint8_t reserved : 6; /* Reserved */
uint8_t sz : 1; /* scope zone bit */
@ -76,9 +86,20 @@ struct pim_encoded_group_ipv4 {
struct in_addr addr;
} __attribute__((packed));
/*
* Encoded Source format. RFC 4601 Sec 4.9.1
* 0 1 2 3
* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* | Addr Family | Encoding Type | Rsrvd |S|W|R| Mask Len |
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* | Source Address
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-...
*/
struct pim_encoded_source_ipv4 {
uint8_t ne;
uint8_t family;
uint8_t ne;
uint8_t bits;
uint8_t mask;
struct in_addr addr;