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

Merge branch 'frr/pull/205' ("Pim stuff")

Browse Source 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2017-02-17 18:06:54 +01:00
commit 9960254b7c
7 changed files with 127 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pimd/pim_iface.c
View File

@ -945,10 +945,7 @@ int pim_if_del_vif(struct interface *ifp)
return -1;
}
if (pim_mroute_del_vif(pim_ifp->mroute_vif_index)) {
/* pim_mroute_del_vif reported error */
return -2;
}
pim_mroute_del_vif(pim_ifp->mroute_vif_index);
/*
Update vif_index

12
pimd/pim_igmpv3.c
View File

@ -389,10 +389,14 @@ void igmp_source_delete(struct igmp_source *source)
listnode_delete(group->group_source_list, source);
igmp_source_free(source);
if (group->group_filtermode_isexcl) {
group_exclude_fwd_anysrc_ifempty(group);
}
/* Group source list is empty and current source is * then
*,G group going away so do not trigger start */
if (group->group_filtermode_isexcl &&
(listcount (group->group_source_list) != 0) &&
source->source_addr.s_addr != INADDR_ANY)
{
group_exclude_fwd_anysrc_ifempty (group);
}
}
static void source_delete_by_flag(struct list *source_list)

17
pimd/pim_join.c
View File

@ -325,14 +325,6 @@ int pim_joinprune_send(struct interface *ifp,
return -1;
}
if (PIM_DEBUG_PIM_J_P) {
char dst_str[INET_ADDRSTRLEN];
pim_inet4_dump("<dst?>", upstream_addr, dst_str, sizeof(dst_str));
zlog_debug("%s: sending %s(S,G)=%s to upstream=%s on interface %s",
__PRETTY_FUNCTION__,
send_join ? "Join" : "Prune",
up->sg_str, dst_str, ifp->name);
}
if (PIM_INADDR_IS_ANY(upstream_addr)) {
if (PIM_DEBUG_PIM_J_P) {
@ -366,6 +358,15 @@ int pim_joinprune_send(struct interface *ifp,
if (pim_msg_size < 0)
return pim_msg_size;
if (PIM_DEBUG_PIM_J_P) {
char dst_str[INET_ADDRSTRLEN];
pim_inet4_dump("<dst?>", upstream_addr, dst_str, sizeof(dst_str));
zlog_debug("%s: sending %s(S,G)=%s to upstream=%s on interface %s",
__PRETTY_FUNCTION__,
send_join ? "Join" : "Prune",
up->sg_str, dst_str, ifp->name);
}
if (pim_msg_send(pim_ifp->pim_sock_fd,
pim_ifp->primary_address,
qpim_all_pim_routers_addr,

32
pimd/pim_mroute.c
View File

@ -734,6 +734,13 @@ int pim_mroute_del_vif(int vif_index)
return -1;
}
if (PIM_DEBUG_MROUTE)
{
struct interface *ifp = pim_if_find_by_vif_index (vif_index);
zlog_debug ("%s %s: Del Vif %d (%s) ", __FILE__,
__PRETTY_FUNCTION__, vif_index, ifp ? ifp->name : "NULL");
}
memset(&vc, 0, sizeof(vc));
vc.vifc_vifi = vif_index;
@ -763,6 +770,17 @@ int pim_mroute_add(struct channel_oil *c_oil, const char *name)
__PRETTY_FUNCTION__);
return -1;
}
/* Do not install route if incoming interface is undefined. */
if (c_oil->oil.mfcc_parent == MAXVIFS)
{
if (PIM_DEBUG_MROUTE)
{
char buf[1000];
zlog_debug("%s(%s) %s Attempting to add vifi that is invalid to mroute table",
__PRETTY_FUNCTION__, name, pim_channel_oil_dump (c_oil, buf, sizeof(buf)));
}
return -2;
}
/* The linux kernel *expects* the incoming
* vif to be part of the outgoing list
@ -834,6 +852,18 @@ int pim_mroute_del (struct channel_oil *c_oil, const char *name)
return -1;
}
if (!c_oil->installed)
{
if (PIM_DEBUG_MROUTE)
{
char buf[1000];
zlog_debug("%s %s: vifi %d for route is %s not installed, do not need to send del req. ",
__FILE__, __PRETTY_FUNCTION__, c_oil->oil.mfcc_parent,
pim_channel_oil_dump (c_oil, buf, sizeof(buf)));
}
return -2;
}
err = setsockopt(qpim_mroute_socket_fd, IPPROTO_IP, MRT_DEL_MFC, &c_oil->oil, sizeof(c_oil->oil));
if (err) {
if (PIM_DEBUG_MROUTE)
@ -852,7 +882,9 @@ int pim_mroute_del (struct channel_oil *c_oil, const char *name)
pim_channel_oil_dump (c_oil, buf, sizeof(buf)));
}
/*reset incoming vifi and kernel installed flags*/
c_oil->installed = 0;
c_oil->oil.mfcc_parent = MAXVIFS;
return 0;
}

13
pimd/pim_msg.c
View File

@ -35,6 +35,7 @@
#include "pim_iface.h"
#include "pim_rp.h"
#include "pim_rpf.h"
#include "pim_register.h"
void pim_msg_build_header(uint8_t *pim_msg, int pim_msg_size,
uint8_t pim_msg_type)
@ -54,8 +55,16 @@ void pim_msg_build_header(uint8_t *pim_msg, int pim_msg_size,
* Compute checksum
*/
*(uint16_t *) PIM_MSG_HDR_OFFSET_CHECKSUM(pim_msg) = 0;
checksum = in_cksum(pim_msg, pim_msg_size);
*(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,
* including the PIM header and the next 4 bytes, excluding the data packet portion
*/
if (pim_msg_type == PIM_MSG_TYPE_REGISTER)
checksum = in_cksum (pim_msg, PIM_MSG_REGISTER_LEN);
else
checksum = in_cksum (pim_msg, pim_msg_size);
*(uint16_t *) PIM_MSG_HDR_OFFSET_CHECKSUM(pim_msg) = checksum;
}

73
pimd/pim_pim.c
View File

@ -197,13 +197,37 @@ int pim_pim_packet(struct interface *ifp, uint8_t *buf, size_t len)
/* for computing checksum */
*(uint16_t *) PIM_MSG_HDR_OFFSET_CHECKSUM(pim_msg) = 0;
checksum = in_cksum(pim_msg, pim_msg_len);
if (checksum != pim_checksum) {
if (PIM_DEBUG_PIM_PACKETS)
zlog_debug("Ignoring PIM pkt from %s with invalid checksum: received=%x calculated=%x",
ifp->name, pim_checksum, checksum);
return -1;
}
if (pim_type == PIM_MSG_TYPE_REGISTER)
{
/* First 8 byte header checksum */
checksum = in_cksum (pim_msg, PIM_MSG_REGISTER_LEN);
if (checksum != pim_checksum)
{
checksum = in_cksum (pim_msg, pim_msg_len);
if (checksum != pim_checksum)
{
if (PIM_DEBUG_PIM_PACKETS)
zlog_debug
("Ignoring PIM pkt from %s with invalid checksum: received=%x calculated=%x",
ifp->name, pim_checksum, checksum);
return -1;
}
}
}
else
{
checksum = in_cksum (pim_msg, pim_msg_len);
if (checksum != pim_checksum)
{
if (PIM_DEBUG_PIM_PACKETS)
zlog_debug
("Ignoring PIM pkt from %s with invalid checksum: received=%x calculated=%x",
ifp->name, pim_checksum, checksum);
return -1;
}
}
if (PIM_DEBUG_PIM_PACKETS) {
pim_inet4_dump("<src?>", ip_hdr->ip_src, src_str, sizeof(src_str));
@ -533,6 +557,8 @@ pim_msg_send(int fd, struct in_addr src,
socklen_t tolen;
unsigned char buffer[10000];
unsigned char *msg_start;
uint8_t ttl = MAXTTL;
enum pim_msg_type pim_type = PIM_MSG_TYPE_HELLO;
struct ip *ip;
memset (buffer, 0, 10000);
@ -541,14 +567,43 @@ pim_msg_send(int fd, struct in_addr src,
msg_start = buffer + sizeof (struct ip);
memcpy (msg_start, pim_msg, pim_msg_size);
ip = (struct ip *)buffer;
/*
* Omnios apparently doesn't have a #define for IP default
* ttl that is the same as all other platforms.
*/
#ifndef IPDEFTTL
#define IPDEFTTL 64
#endif
/* TTL for packets destine to ALL-PIM-ROUTERS is 1 */
pim_type = PIM_MSG_HDR_GET_TYPE (pim_msg);
switch (pim_type)
{
case PIM_MSG_TYPE_HELLO:
case PIM_MSG_TYPE_JOIN_PRUNE:
case PIM_MSG_TYPE_BOOTSTRAP:
case PIM_MSG_TYPE_ASSERT:
ttl = 1;
break;
case PIM_MSG_TYPE_REGISTER:
case PIM_MSG_TYPE_REG_STOP:
case PIM_MSG_TYPE_GRAFT:
case PIM_MSG_TYPE_GRAFT_ACK:
case PIM_MSG_TYPE_CANDIDATE:
ttl = IPDEFTTL;
break;
default:
ttl = MAXTTL;
break;
}
ip = (struct ip *) buffer;
ip->ip_id = htons (++ip_id);
ip->ip_hl = 5;
ip->ip_v = 4;
ip->ip_p = PIM_IP_PROTO_PIM;
ip->ip_src = src;
ip->ip_dst = dst;
ip->ip_ttl = MAXTTL;
ip->ip_ttl = ttl;
ip->ip_len = htons (sendlen);
if (PIM_DEBUG_PIM_PACKETS) {

3
pimd/pim_zlookup.c
View File

@ -455,7 +455,8 @@ pim_zlookup_sg_statistics (struct channel_oil *c_oil)
more.src = c_oil->oil.mfcc_origin;
more.grp = c_oil->oil.mfcc_mcastgrp;
zlog_debug ("Sending Request for New Channel Oil Information(%s)", pim_str_sg_dump (&more));
zlog_debug ("Sending Request for New Channel Oil Information(%s) VIIF %d",
pim_str_sg_dump (&more), c_oil->oil.mfcc_parent);
}
if (!ifp)