Skip to content

Commit

Permalink
*: Remove break after return
Browse files Browse the repository at this point in the history 
Just a deadcode.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
  • Loading branch information
@ton31337
ton31337 committed Feb 13, 2020
1 parent 60092db commit 7520226
Show file tree
Hide file tree
Showing 34 changed files with 1 addition and 397 deletions.
3 changes: 0 additions & 3 deletions babeld/kernel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,8 @@ kernel_route(enum babel_kernel_routes operation, const unsigned char *pref,
switch (operation) {
case ROUTE_ADD:
return zebra_route(1, family, pref, plen, gate, ifindex, metric);
break;
case ROUTE_FLUSH:
return zebra_route(0, family, pref, plen, gate, ifindex, metric);
break;
case ROUTE_MODIFY:
if(newmetric == metric && memcmp(newgate, gate, 16) == 0 &&
newifindex == ifindex)
Expand All @@ -119,7 +117,6 @@ kernel_route(enum babel_kernel_routes operation, const unsigned char *pref,
rc = zebra_route(1, family, pref, plen, newgate, newifindex,
newmetric);
return rc;
break;
}

return 0;
Expand Down
22 changes: 0 additions & 22 deletions bgpd/bgp_route.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8445,70 +8445,48 @@ static const char *bgp_path_selection_reason2str(
switch (reason) {
case bgp_path_selection_none:
return "Nothing to Select";
break;
case bgp_path_selection_first:
return "First path received";
break;
case bgp_path_selection_evpn_sticky_mac:
return "EVPN Sticky Mac";
break;
case bgp_path_selection_evpn_seq:
return "EVPN sequence number";
break;
case bgp_path_selection_evpn_lower_ip:
return "EVPN lower IP";
break;
case bgp_path_selection_weight:
return "Weight";
break;
case bgp_path_selection_local_pref:
return "Local Pref";
break;
case bgp_path_selection_local_route:
return "Local Route";
break;
case bgp_path_selection_confed_as_path:
return "Confederation based AS Path";
break;
case bgp_path_selection_as_path:
return "AS Path";
break;
case bgp_path_selection_origin:
return "Origin";
break;
case bgp_path_selection_med:
return "MED";
break;
case bgp_path_selection_peer:
return "Peer Type";
break;
case bgp_path_selection_confed:
return "Confed Peer Type";
break;
case bgp_path_selection_igp_metric:
return "IGP Metric";
break;
case bgp_path_selection_older:
return "Older Path";
break;
case bgp_path_selection_router_id:
return "Router ID";
break;
case bgp_path_selection_cluster_length:
return "Cluser length";
break;
case bgp_path_selection_stale:
return "Path Staleness";
break;
case bgp_path_selection_local_configured:
return "Locally configured route";
break;
case bgp_path_selection_neighbor_ip:
return "Neighbor IP";
break;
case bgp_path_selection_default:
return "Nothing left to compare";
break;
}
return "Invalid (internal error)";
}
Expand Down
39 changes: 1 addition & 38 deletions bgpd/bgp_snmp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -528,10 +528,8 @@ static uint8_t *bgpPeerTable(struct variable *v, oid name[], size_t *length,
switch (v->magic) {
case BGPPEERIDENTIFIER:
return SNMP_IPADDRESS(peer->remote_id);
break;
case BGPPEERSTATE:
return SNMP_INTEGER(peer->status);
break;
case BGPPEERADMINSTATUS:
*write_method = write_bgpPeerTable;
#define BGP_PeerAdmin_stop 1
Expand All @@ -540,108 +538,87 @@ static uint8_t *bgpPeerTable(struct variable *v, oid name[], size_t *length,
return SNMP_INTEGER(BGP_PeerAdmin_stop);
else
return SNMP_INTEGER(BGP_PeerAdmin_start);
break;
case BGPPEERNEGOTIATEDVERSION:
return SNMP_INTEGER(BGP_VERSION_4);
break;
case BGPPEERLOCALADDR:
if (peer->su_local)
return SNMP_IPADDRESS(peer->su_local->sin.sin_addr);
else
return SNMP_IPADDRESS(bgp_empty_addr);
break;
case BGPPEERLOCALPORT:
if (peer->su_local)
return SNMP_INTEGER(
ntohs(peer->su_local->sin.sin_port));
else
return SNMP_INTEGER(0);
break;
case BGPPEERREMOTEADDR:
if (peer->su_remote)
return SNMP_IPADDRESS(peer->su_remote->sin.sin_addr);
else
return SNMP_IPADDRESS(bgp_empty_addr);
break;
case BGPPEERREMOTEPORT:
if (peer->su_remote)
return SNMP_INTEGER(
ntohs(peer->su_remote->sin.sin_port));
else
return SNMP_INTEGER(0);
break;
case BGPPEERREMOTEAS:
return SNMP_INTEGER(peer->as);
break;
case BGPPEERINUPDATES:
ui = atomic_load_explicit(&peer->update_in,
memory_order_relaxed);
return SNMP_INTEGER(ui);
break;
case BGPPEEROUTUPDATES:
uo = atomic_load_explicit(&peer->update_out,
memory_order_relaxed);
return SNMP_INTEGER(uo);
break;
case BGPPEERINTOTALMESSAGES:
return SNMP_INTEGER(PEER_TOTAL_RX(peer));
break;
case BGPPEEROUTTOTALMESSAGES:
return SNMP_INTEGER(PEER_TOTAL_TX(peer));
break;
case BGPPEERLASTERROR: {
static uint8_t lasterror[2];
lasterror[0] = peer->notify.code;
lasterror[1] = peer->notify.subcode;
*var_len = 2;
return (uint8_t *)&lasterror;
} break;
}
case BGPPEERFSMESTABLISHEDTRANSITIONS:
return SNMP_INTEGER(peer->established);
break;
case BGPPEERFSMESTABLISHEDTIME:
if (peer->uptime == 0)
return SNMP_INTEGER(0);
else
return SNMP_INTEGER(bgp_clock() - peer->uptime);
break;
case BGPPEERCONNECTRETRYINTERVAL:
*write_method = write_bgpPeerTable;
return SNMP_INTEGER(peer->v_connect);
break;
case BGPPEERHOLDTIME:
return SNMP_INTEGER(peer->v_holdtime);
break;
case BGPPEERKEEPALIVE:
return SNMP_INTEGER(peer->v_keepalive);
break;
case BGPPEERHOLDTIMECONFIGURED:
*write_method = write_bgpPeerTable;
if (CHECK_FLAG(peer->flags, PEER_FLAG_TIMER))
return SNMP_INTEGER(peer->holdtime);
else
return SNMP_INTEGER(peer->v_holdtime);
break;
case BGPPEERKEEPALIVECONFIGURED:
*write_method = write_bgpPeerTable;
if (CHECK_FLAG(peer->flags, PEER_FLAG_TIMER))
return SNMP_INTEGER(peer->keepalive);
else
return SNMP_INTEGER(peer->v_keepalive);
break;
case BGPPEERMINROUTEADVERTISEMENTINTERVAL:
*write_method = write_bgpPeerTable;
return SNMP_INTEGER(peer->v_routeadv);
break;
case BGPPEERINUPDATEELAPSEDTIME:
if (peer->update_time == 0)
return SNMP_INTEGER(0);
else
return SNMP_INTEGER(bgp_clock() - peer->update_time);
break;
default:
return NULL;
break;
}
return NULL;
}
Expand Down Expand Up @@ -834,52 +811,38 @@ static uint8_t *bgp4PathAttrTable(struct variable *v, oid name[],
switch (v->magic) {
case BGP4PATHATTRPEER: /* 1 */
return SNMP_IPADDRESS(path->peer->su.sin.sin_addr);
break;
case BGP4PATHATTRIPADDRPREFIXLEN: /* 2 */
return SNMP_INTEGER(addr.prefixlen);
break;
case BGP4PATHATTRIPADDRPREFIX: /* 3 */
return SNMP_IPADDRESS(addr.prefix);
break;
case BGP4PATHATTRORIGIN: /* 4 */
return SNMP_INTEGER(path->attr->origin);
break;
case BGP4PATHATTRASPATHSEGMENT: /* 5 */
return aspath_snmp_pathseg(path->attr->aspath, var_len);
break;
case BGP4PATHATTRNEXTHOP: /* 6 */
return SNMP_IPADDRESS(path->attr->nexthop);
break;
case BGP4PATHATTRMULTIEXITDISC: /* 7 */
return SNMP_INTEGER(path->attr->med);
break;
case BGP4PATHATTRLOCALPREF: /* 8 */
return SNMP_INTEGER(path->attr->local_pref);
break;
case BGP4PATHATTRATOMICAGGREGATE: /* 9 */
return SNMP_INTEGER(1);
break;
case BGP4PATHATTRAGGREGATORAS: /* 10 */
return SNMP_INTEGER(path->attr->aggregator_as);
break;
case BGP4PATHATTRAGGREGATORADDR: /* 11 */
return SNMP_IPADDRESS(path->attr->aggregator_addr);
break;
case BGP4PATHATTRCALCLOCALPREF: /* 12 */
return SNMP_INTEGER(-1);
break;
case BGP4PATHATTRBEST: /* 13 */
#define BGP4_PathAttrBest_false 1
#define BGP4_PathAttrBest_true 2
if (CHECK_FLAG(path->flags, BGP_PATH_SELECTED))
return SNMP_INTEGER(BGP4_PathAttrBest_true);
else
return SNMP_INTEGER(BGP4_PathAttrBest_false);
break;
case BGP4PATHATTRUNKNOWN: /* 14 */
*var_len = 0;
return NULL;
break;
}
return NULL;
}
Expand Down
12 changes: 0 additions & 12 deletions bgpd/bgp_vty.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,54 +142,42 @@ static enum node_type bgp_node_type(afi_t afi, safi_t safi)
switch (safi) {
case SAFI_UNICAST:
return BGP_IPV4_NODE;
break;
case SAFI_MULTICAST:
return BGP_IPV4M_NODE;
break;
case SAFI_LABELED_UNICAST:
return BGP_IPV4L_NODE;
break;
case SAFI_MPLS_VPN:
return BGP_VPNV4_NODE;
break;
case SAFI_FLOWSPEC:
return BGP_FLOWSPECV4_NODE;
default:
/* not expected */
return BGP_IPV4_NODE;
break;
}
break;
case AFI_IP6:
switch (safi) {
case SAFI_UNICAST:
return BGP_IPV6_NODE;
break;
case SAFI_MULTICAST:
return BGP_IPV6M_NODE;
break;
case SAFI_LABELED_UNICAST:
return BGP_IPV6L_NODE;
break;
case SAFI_MPLS_VPN:
return BGP_VPNV6_NODE;
break;
case SAFI_FLOWSPEC:
return BGP_FLOWSPECV6_NODE;
default:
/* not expected */
return BGP_IPV4_NODE;
break;
}
break;
case AFI_L2VPN:
return BGP_EVPN_NODE;
break;
case AFI_UNSPEC:
case AFI_MAX:
// We should never be here but to clarify the switch statement..
return BGP_IPV4_NODE;
break;
}

// Impossible to happen
Expand Down
15 changes: 0 additions & 15 deletions bgpd/bgpd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1965,62 +1965,47 @@ static inline int afindex(afi_t afi, safi_t safi)
switch (safi) {
case SAFI_UNICAST:
return BGP_AF_IPV4_UNICAST;
break;
case SAFI_MULTICAST:
return BGP_AF_IPV4_MULTICAST;
break;
case SAFI_LABELED_UNICAST:
return BGP_AF_IPV4_LBL_UNICAST;
break;
case SAFI_MPLS_VPN:
return BGP_AF_IPV4_VPN;
break;
case SAFI_ENCAP:
return BGP_AF_IPV4_ENCAP;
break;
case SAFI_FLOWSPEC:
return BGP_AF_IPV4_FLOWSPEC;
default:
return BGP_AF_MAX;
break;
}
break;
case AFI_IP6:
switch (safi) {
case SAFI_UNICAST:
return BGP_AF_IPV6_UNICAST;
break;
case SAFI_MULTICAST:
return BGP_AF_IPV6_MULTICAST;
break;
case SAFI_LABELED_UNICAST:
return BGP_AF_IPV6_LBL_UNICAST;
break;
case SAFI_MPLS_VPN:
return BGP_AF_IPV6_VPN;
break;
case SAFI_ENCAP:
return BGP_AF_IPV6_ENCAP;
break;
case SAFI_FLOWSPEC:
return BGP_AF_IPV6_FLOWSPEC;
default:
return BGP_AF_MAX;
break;
}
break;
case AFI_L2VPN:
switch (safi) {
case SAFI_EVPN:
return BGP_AF_L2VPN_EVPN;
break;
default:
return BGP_AF_MAX;
break;
}
default:
return BGP_AF_MAX;
break;
}
}

Expand Down
Loading

0 comments on commit 7520226

Please sign in to comment.