mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-08-12 10:56:31 +00:00
02a261b5ba
Add support for the new TCA_MPLS_ACT_MAC_PUSH action (kernel commit
a45294af9e96 ("net/sched: act_mpls: Add action to push MPLS LSE before
Ethernet header")). This action let TC push an MPLS header before the
MAC header of a frame.
Example (encapsulate all outgoing frames with label 20, then add an
outer Ethernet header):
# tc filter add dev ethX matchall \
action mpls mac_push label 20 ttl 64 \
action vlan push_eth dst_mac 0a:00:00:00:00:02 \
src_mac 0a:00:00:00:00:01
This patch also adds an alias for ETH_P_TEB, since it is useful when
decapsulating MPLS packets that contain an Ethernet frame.
With MAC_PUSH, there's no previous Ethertype to modify. However, the
"protocol" option is still needed, because the kernel uses it to set
skb->protocol. So rename can_modify_ethtype() to can_set_ethtype().
Also add a test suite for m_mpls, which covers the new action and the
pre-existing ones.
Signed-off-by: Guillaume Nault <gnault@redhat.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
119 lines
2.3 KiB
C
119 lines
2.3 KiB
C
/*
|
|
* ll_proto.c
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*
|
|
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <sys/ioctl.h>
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#include <string.h>
|
|
|
|
#include <linux/netdevice.h>
|
|
#include <linux/if_arp.h>
|
|
#include <linux/sockios.h>
|
|
|
|
#include "utils.h"
|
|
#include "rt_names.h"
|
|
|
|
|
|
#define __PF(f,n) { ETH_P_##f, #n },
|
|
static const struct {
|
|
int id;
|
|
const char *name;
|
|
} llproto_names[] = {
|
|
__PF(LOOP,loop)
|
|
__PF(PUP,pup)
|
|
__PF(PUPAT,pupat)
|
|
__PF(IP,ip)
|
|
__PF(X25,x25)
|
|
__PF(ARP,arp)
|
|
__PF(BPQ,bpq)
|
|
__PF(IEEEPUP,ieeepup)
|
|
__PF(IEEEPUPAT,ieeepupat)
|
|
__PF(DEC,dec)
|
|
__PF(DNA_DL,dna_dl)
|
|
__PF(DNA_RC,dna_rc)
|
|
__PF(DNA_RT,dna_rt)
|
|
__PF(LAT,lat)
|
|
__PF(DIAG,diag)
|
|
__PF(CUST,cust)
|
|
__PF(SCA,sca)
|
|
__PF(RARP,rarp)
|
|
__PF(ATALK,atalk)
|
|
__PF(AARP,aarp)
|
|
__PF(IPX,ipx)
|
|
__PF(IPV6,ipv6)
|
|
__PF(PPP_DISC,ppp_disc)
|
|
__PF(PPP_SES,ppp_ses)
|
|
__PF(ATMMPOA,atmmpoa)
|
|
__PF(ATMFATE,atmfate)
|
|
__PF(802_3,802_3)
|
|
__PF(AX25,ax25)
|
|
__PF(ALL,all)
|
|
__PF(802_2,802_2)
|
|
__PF(SNAP,snap)
|
|
__PF(DDCMP,ddcmp)
|
|
__PF(WAN_PPP,wan_ppp)
|
|
__PF(PPP_MP,ppp_mp)
|
|
__PF(LOCALTALK,localtalk)
|
|
__PF(CAN,can)
|
|
__PF(PPPTALK,ppptalk)
|
|
__PF(TR_802_2,tr_802_2)
|
|
__PF(MOBITEX,mobitex)
|
|
__PF(CONTROL,control)
|
|
__PF(IRDA,irda)
|
|
__PF(ECONET,econet)
|
|
__PF(TIPC,tipc)
|
|
__PF(AOE,aoe)
|
|
__PF(8021Q,802.1Q)
|
|
__PF(8021AD,802.1ad)
|
|
__PF(MPLS_UC,mpls_uc)
|
|
__PF(MPLS_MC,mpls_mc)
|
|
__PF(TEB,teb)
|
|
|
|
{ 0x8100, "802.1Q" },
|
|
{ 0x88cc, "LLDP" },
|
|
{ ETH_P_IP, "ipv4" },
|
|
};
|
|
#undef __PF
|
|
|
|
|
|
const char * ll_proto_n2a(unsigned short id, char *buf, int len)
|
|
{
|
|
int i;
|
|
|
|
id = ntohs(id);
|
|
|
|
for (i=0; !numeric && i<sizeof(llproto_names)/sizeof(llproto_names[0]); i++) {
|
|
if (llproto_names[i].id == id)
|
|
return llproto_names[i].name;
|
|
}
|
|
snprintf(buf, len, "[%d]", id);
|
|
return buf;
|
|
}
|
|
|
|
int ll_proto_a2n(unsigned short *id, const char *buf)
|
|
{
|
|
int i;
|
|
for (i=0; i < sizeof(llproto_names)/sizeof(llproto_names[0]); i++) {
|
|
if (strcasecmp(llproto_names[i].name, buf) == 0) {
|
|
*id = htons(llproto_names[i].id);
|
|
return 0;
|
|
}
|
|
}
|
|
if (get_be16(id, buf, 0))
|
|
return -1;
|
|
return 0;
|
|
}
|