proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 16:04:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Add 'struct pim_msg_header' packed data structure.

Browse Source 
Add the 'struct pim_msg_header' and convert
all places that encoded/decoded the message header
to use it.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-02-09 13:47:42 -05:00
parent 09778298e2
commit 70ce34ae66
4 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pimd/pim_msg.c
View File

@ -40,32 +40,27 @@
void pim_msg_build_header(uint8_t *pim_msg, int pim_msg_size, void pim_msg_build_header(uint8_t *pim_msg, int pim_msg_size,
uint8_t pim_msg_type) uint8_t pim_msg_type)
{ {
uint16_t checksum; struct pim_msg_header *header = (struct pim_msg_header *)pim_msg;
zassert(pim_msg_size >= PIM_PIM_MIN_LEN); zassert(pim_msg_size >= PIM_PIM_MIN_LEN);
/* /*
* Write header * Write header
*/ */
header->ver = PIM_PROTO_VERSION;
header->type = pim_msg_type;
header->reserved = 0;
*(uint8_t *) PIM_MSG_HDR_OFFSET_VERSION(pim_msg) = (PIM_PROTO_VERSION << 4) | pim_msg_type;
*(uint8_t *) PIM_MSG_HDR_OFFSET_RESERVED(pim_msg) = 0;
/* header->checksum = 0;
* Compute checksum
*/
*(uint16_t *) PIM_MSG_HDR_OFFSET_CHECKSUM (pim_msg) = 0;
/* /*
* The checksum for Registers is done only on the first 8 bytes of the packet, * The checksum for Registers is done only on the first 8 bytes of the packet,
* including the PIM header and the next 4 bytes, excluding the data packet portion * including the PIM header and the next 4 bytes, excluding the data packet portion
*/ */
if (pim_msg_type == PIM_MSG_TYPE_REGISTER) if (pim_msg_type == PIM_MSG_TYPE_REGISTER)
checksum = in_cksum (pim_msg, PIM_MSG_REGISTER_LEN); header->checksum = in_cksum (pim_msg, PIM_MSG_REGISTER_LEN);
else else
checksum = in_cksum (pim_msg, pim_msg_size); header->checksum = in_cksum (pim_msg, pim_msg_size);
*(uint16_t *) PIM_MSG_HDR_OFFSET_CHECKSUM(pim_msg) = checksum;
} }
uint8_t *pim_msg_addr_encode_ipv4_ucast(uint8_t *buf, uint8_t *pim_msg_addr_encode_ipv4_ucast(uint8_t *buf,

10
pimd/pim_msg.h
View File

@ -35,6 +35,16 @@
*/ */
#define PIM_MSG_ADDRESS_FAMILY_IPV4 (1) #define PIM_MSG_ADDRESS_FAMILY_IPV4 (1)
/*
* Network Order pim_msg_hdr
*/
struct pim_msg_header {
uint8_t type:4;
uint8_t ver:4;
uint8_t reserved;
uint16_t checksum;
} __attribute__ ((packed));
void pim_msg_build_header(uint8_t *pim_msg, int pim_msg_size, void pim_msg_build_header(uint8_t *pim_msg, int pim_msg_size,
uint8_t pim_msg_type); uint8_t pim_msg_type);
uint8_t *pim_msg_addr_encode_ipv4_ucast(uint8_t *buf, uint8_t *pim_msg_addr_encode_ipv4_ucast(uint8_t *buf,

38
pimd/pim_pim.c
View File

@ -135,11 +135,10 @@ int pim_pim_packet(struct interface *ifp, uint8_t *buf, size_t len)
char dst_str[INET_ADDRSTRLEN]; char dst_str[INET_ADDRSTRLEN];
uint8_t *pim_msg; uint8_t *pim_msg;
int pim_msg_len; int pim_msg_len;
uint8_t pim_version;
enum pim_msg_type pim_type;
uint16_t pim_checksum; /* received checksum */ uint16_t pim_checksum; /* received checksum */
uint16_t checksum; /* computed checksum */ uint16_t checksum; /* computed checksum */
struct pim_neighbor *neigh; struct pim_neighbor *neigh;
struct pim_msg_header *header;
if (len < sizeof(*ip_hdr)) { if (len < sizeof(*ip_hdr)) {
if (PIM_DEBUG_PIM_PACKETS) if (PIM_DEBUG_PIM_PACKETS)
@ -174,6 +173,7 @@ int pim_pim_packet(struct interface *ifp, uint8_t *buf, size_t len)
pim_msg = buf + ip_hlen; pim_msg = buf + ip_hlen;
pim_msg_len = len - ip_hlen; pim_msg_len = len - ip_hlen;
header = (struct pim_msg_header *)pim_msg;
if (pim_msg_len < PIM_PIM_MIN_LEN) { if (pim_msg_len < PIM_PIM_MIN_LEN) {
if (PIM_DEBUG_PIM_PACKETS) if (PIM_DEBUG_PIM_PACKETS)
zlog_debug("PIM message size=%d shorter than minimum=%d", zlog_debug("PIM message size=%d shorter than minimum=%d",
@ -181,23 +181,20 @@ int pim_pim_packet(struct interface *ifp, uint8_t *buf, size_t len)
return -1; return -1;
} }
pim_version = PIM_MSG_HDR_GET_VERSION(pim_msg); if (header->ver != PIM_PROTO_VERSION) {
pim_type = PIM_MSG_HDR_GET_TYPE(pim_msg);
if (pim_version != PIM_PROTO_VERSION) {
if (PIM_DEBUG_PIM_PACKETS) if (PIM_DEBUG_PIM_PACKETS)
zlog_debug("Ignoring PIM pkt from %s with unsupported version: %d", zlog_debug("Ignoring PIM pkt from %s with unsupported version: %d",
ifp->name, pim_version); ifp->name, header->ver);
return -1; return -1;
} }
/* save received checksum */ /* save received checksum */
pim_checksum = PIM_MSG_HDR_GET_CHECKSUM(pim_msg); pim_checksum = header->checksum;
/* for computing checksum */ /* for computing checksum */
*(uint16_t *) PIM_MSG_HDR_OFFSET_CHECKSUM(pim_msg) = 0; header->checksum = 0;
if (pim_type == PIM_MSG_TYPE_REGISTER) if (header->type == PIM_MSG_TYPE_REGISTER)
{ {
/* First 8 byte header checksum */ /* First 8 byte header checksum */
checksum = in_cksum (pim_msg, PIM_MSG_REGISTER_LEN); checksum = in_cksum (pim_msg, PIM_MSG_REGISTER_LEN);
@ -233,14 +230,14 @@ int pim_pim_packet(struct interface *ifp, uint8_t *buf, size_t len)
pim_inet4_dump("<src?>", ip_hdr->ip_src, src_str, sizeof(src_str)); pim_inet4_dump("<src?>", ip_hdr->ip_src, src_str, sizeof(src_str));
pim_inet4_dump("<dst?>", ip_hdr->ip_dst, dst_str, sizeof(dst_str)); pim_inet4_dump("<dst?>", ip_hdr->ip_dst, dst_str, sizeof(dst_str));
zlog_debug("Recv PIM %s packet from %s to %s on %s: ttl=%d pim_version=%d pim_msg_size=%d checksum=%x", zlog_debug("Recv PIM %s packet from %s to %s on %s: ttl=%d pim_version=%d pim_msg_size=%d checksum=%x",
pim_pim_msgtype2str (pim_type), src_str, dst_str, ifp->name, pim_pim_msgtype2str (header->type), src_str, dst_str, ifp->name,
ip_hdr->ip_ttl, pim_version, pim_msg_len, checksum); ip_hdr->ip_ttl, header->ver, pim_msg_len, checksum);
if (PIM_DEBUG_PIM_PACKETDUMP_RECV) { if (PIM_DEBUG_PIM_PACKETDUMP_RECV) {
pim_pkt_dump(__PRETTY_FUNCTION__, pim_msg, pim_msg_len); pim_pkt_dump(__PRETTY_FUNCTION__, pim_msg, pim_msg_len);
} }
} }
switch (pim_type) switch (header->type)
{ {
case PIM_MSG_TYPE_HELLO: case PIM_MSG_TYPE_HELLO:
return pim_hello_recv (ifp, return pim_hello_recv (ifp,
@ -265,7 +262,7 @@ int pim_pim_packet(struct interface *ifp, uint8_t *buf, size_t len)
if (PIM_DEBUG_PIM_PACKETS) if (PIM_DEBUG_PIM_PACKETS)
zlog_debug("%s %s: non-hello PIM message type=%d from non-neighbor %s on %s", zlog_debug("%s %s: non-hello PIM message type=%d from non-neighbor %s on %s",
__FILE__, __PRETTY_FUNCTION__, __FILE__, __PRETTY_FUNCTION__,
pim_type, src_str, ifp->name); header->type, src_str, ifp->name);
return -1; return -1;
} }
pim_neighbor_timer_reset(neigh, neigh->holdtime); pim_neighbor_timer_reset(neigh, neigh->holdtime);
@ -280,7 +277,7 @@ int pim_pim_packet(struct interface *ifp, uint8_t *buf, size_t len)
if (PIM_DEBUG_PIM_PACKETS) if (PIM_DEBUG_PIM_PACKETS)
zlog_debug("%s %s: non-hello PIM message type=%d from non-neighbor %s on %s", zlog_debug("%s %s: non-hello PIM message type=%d from non-neighbor %s on %s",
__FILE__, __PRETTY_FUNCTION__, __FILE__, __PRETTY_FUNCTION__,
pim_type, src_str, ifp->name); header->type, src_str, ifp->name);
return -1; return -1;
} }
pim_neighbor_timer_reset(neigh, neigh->holdtime); pim_neighbor_timer_reset(neigh, neigh->holdtime);
@ -292,7 +289,7 @@ int pim_pim_packet(struct interface *ifp, uint8_t *buf, size_t len)
default: default:
if (PIM_DEBUG_PIM_PACKETS) { if (PIM_DEBUG_PIM_PACKETS) {
zlog_debug("Recv PIM packet type %d which is not currently understood", zlog_debug("Recv PIM packet type %d which is not currently understood",
pim_type); header->type);
} }
return -1; return -1;
} }
@ -558,7 +555,7 @@ pim_msg_send(int fd, struct in_addr src,
unsigned char buffer[10000]; unsigned char buffer[10000];
unsigned char *msg_start; unsigned char *msg_start;
uint8_t ttl = MAXTTL; uint8_t ttl = MAXTTL;
enum pim_msg_type pim_type = PIM_MSG_TYPE_HELLO; struct pim_msg_header *header;
struct ip *ip; struct ip *ip;
memset (buffer, 0, 10000); memset (buffer, 0, 10000);
@ -567,6 +564,7 @@ pim_msg_send(int fd, struct in_addr src,
msg_start = buffer + sizeof (struct ip); msg_start = buffer + sizeof (struct ip);
memcpy (msg_start, pim_msg, pim_msg_size); memcpy (msg_start, pim_msg, pim_msg_size);
header = (struct pim_msg_header *)pim_msg;
/* /*
* Omnios apparently doesn't have a #define for IP default * Omnios apparently doesn't have a #define for IP default
* ttl that is the same as all other platforms. * ttl that is the same as all other platforms.
@ -575,8 +573,7 @@ pim_msg_send(int fd, struct in_addr src,
#define IPDEFTTL 64 #define IPDEFTTL 64
#endif #endif
/* TTL for packets destine to ALL-PIM-ROUTERS is 1 */ /* TTL for packets destine to ALL-PIM-ROUTERS is 1 */
pim_type = PIM_MSG_HDR_GET_TYPE (pim_msg); switch (header->type)
switch (pim_type)
{ {
case PIM_MSG_TYPE_HELLO: case PIM_MSG_TYPE_HELLO:
case PIM_MSG_TYPE_JOIN_PRUNE: case PIM_MSG_TYPE_JOIN_PRUNE:
@ -607,12 +604,13 @@ pim_msg_send(int fd, struct in_addr src,
ip->ip_len = htons (sendlen); ip->ip_len = htons (sendlen);
if (PIM_DEBUG_PIM_PACKETS) { if (PIM_DEBUG_PIM_PACKETS) {
struct pim_msg_header *header = (struct pim_msg_header *)pim_msg;
char dst_str[INET_ADDRSTRLEN]; char dst_str[INET_ADDRSTRLEN];
pim_inet4_dump("<dst?>", dst, dst_str, sizeof(dst_str)); pim_inet4_dump("<dst?>", dst, dst_str, sizeof(dst_str));
zlog_debug("%s: to %s on %s: msg_size=%d checksum=%x", zlog_debug("%s: to %s on %s: msg_size=%d checksum=%x",
__PRETTY_FUNCTION__, __PRETTY_FUNCTION__,
dst_str, ifname, pim_msg_size, dst_str, ifname, pim_msg_size,
*(uint16_t *) PIM_MSG_HDR_OFFSET_CHECKSUM(pim_msg)); header->checksum);
} }
memset(&to, 0, sizeof(to)); memset(&to, 0, sizeof(to));

9
pimd/pim_pim.h
View File

@ -48,15 +48,6 @@ enum pim_msg_type {
PIM_MSG_TYPE_CANDIDATE PIM_MSG_TYPE_CANDIDATE
}; };
#define PIM_MSG_HDR_OFFSET_VERSION(pim_msg) (pim_msg)
#define PIM_MSG_HDR_OFFSET_TYPE(pim_msg) (pim_msg)
#define PIM_MSG_HDR_OFFSET_RESERVED(pim_msg) (((char *)(pim_msg)) + 1)
#define PIM_MSG_HDR_OFFSET_CHECKSUM(pim_msg) (((char *)(pim_msg)) + 2)
#define PIM_MSG_HDR_GET_VERSION(pim_msg) ((*(uint8_t*) PIM_MSG_HDR_OFFSET_VERSION(pim_msg)) >> 4)
#define PIM_MSG_HDR_GET_TYPE(pim_msg) ((*(uint8_t*) PIM_MSG_HDR_OFFSET_TYPE(pim_msg)) & 0xF)
#define PIM_MSG_HDR_GET_CHECKSUM(pim_msg) (*(uint16_t*) PIM_MSG_HDR_OFFSET_CHECKSUM(pim_msg))
void pim_ifstat_reset(struct interface *ifp); void pim_ifstat_reset(struct interface *ifp);
void pim_sock_reset(struct interface *ifp); void pim_sock_reset(struct interface *ifp);
int pim_sock_add(struct interface *ifp); int pim_sock_add(struct interface *ifp);