upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 08:43:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

transition patches mpd4 (https://github.com/opnsense/core/issues/153)

Browse source
This commit is contained in:
Ad Schellevis 2015-04-25 15:49:34 +02:00
parent 4f05bc2ce4
commit 3fbe0bd0b2
7 changed files with 138 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sys/netgraph/ng_base.c
View file

@ -64,6 +64,10 @@
#include <sys/unistd.h>
#include <machine/cpu.h>
#include <sys/socket.h>
#include <net/if.h>
#include <net/if_var.h>
#include <net/netisr.h>
#include <net/vnet.h>
@ -240,6 +244,8 @@ int ng_path_parse(char *addr, char **node, char **path, char **hook);
void ng_rmnode(node_p node, hook_p dummy1, void *dummy2, int dummy3);
void ng_unname(node_p node);
extern void (*ng_ether_attach_p)(struct ifnet *ifp);
/* Our own netgraph malloc type */
MALLOC_DEFINE(M_NETGRAPH, "netgraph", "netgraph structures and ctrl messages");
MALLOC_DEFINE(M_NETGRAPH_MSG, "netgraph_msg", "netgraph name storage");
@ -574,6 +580,13 @@ static const struct ng_cmdlist ng_generic_cmds[] = {
&ng_parse_ng_mesg_type,
&ng_parse_ng_mesg_type
},
{
NGM_GENERIC_COOKIE,
NGM_ETHER_ATTACH,
"attach",
&ng_parse_string_type,
NULL
},
{ 0 }
};
@ -2908,6 +2921,17 @@ ng_generic_msg(node_p here, item_p item, hook_p lasthook)
break;
}
case NGM_ETHER_ATTACH:
{
struct ifnet *ifp;
ifp = ifunit((char *)msg->data);
if (ifp && ng_ether_attach_p != NULL) {
ng_ether_attach_p(ifp);
}
break;
}
case NGM_TEXT_CONFIG:
case NGM_TEXT_STATUS:
/*

53
sys/netgraph/ng_eiface.c
View file

@ -43,6 +43,7 @@
#include <net/if.h>
#include <net/if_media.h>
#include <net/if_types.h>
#include <net/if_dl.h>
#include <net/netisr.h>
#include <net/route.h>
#include <net/vnet.h>
@ -64,6 +65,13 @@ static const struct ng_cmdlist ng_eiface_cmdlist[] = {
NULL,
&ng_parse_string_type
},
{
NGM_EIFACE_COOKIE,
NGM_EIFACE_SET_IFNAME,
"setifname",
&ng_parse_string_type,
NULL
},
{
NGM_EIFACE_COOKIE,
NGM_EIFACE_SET,
@ -470,6 +478,11 @@ ng_eiface_rcvmsg(node_p node, item_p item, hook_p lasthook)
struct ng_mesg *resp = NULL;
int error = 0;
struct ng_mesg *msg;
char *new_name;
size_t namelen, onamelen;
struct sockaddr_dl *sdl = NULL;
struct ifaddr *ifa = NULL;
node_p ethernode;
NGI_GET_MSG(item, msg);
switch (msg->header.typecookie) {
@ -496,6 +509,46 @@ ng_eiface_rcvmsg(node_p node, item_p item, hook_p lasthook)
}
strlcpy(resp->data, ifp->if_xname, IFNAMSIZ);
break;
case NGM_EIFACE_SET_IFNAME:
new_name = (char *)msg->data;
/* Deny request if interface is UP */
if ((ifp->if_flags & IFF_UP) != 0) {
error = EBUSY;
break;
}
EVENTHANDLER_INVOKE(ifnet_departure_event, ifp);
ethernode = ng_name2noderef(node, ifp->if_xname);
if (ethernode != NULL)
ng_name_node(ethernode, new_name);
strlcpy(ifp->if_xname, new_name, sizeof(ifp->if_xname));
ifa = ifp->if_addr;
IFA_LOCK(ifa);
sdl = (struct sockaddr_dl *)ifa->ifa_addr;
namelen = strlen(new_name) + 1;
onamelen = sdl->sdl_nlen;
/*
* Move the address if needed. This is safe because we
* allocate space for a name of length IFNAMSIZ when we
* create this in if_attach().
*/
if (namelen != onamelen) {
bcopy(sdl->sdl_data + onamelen,
sdl->sdl_data + namelen, sdl->sdl_alen);
}
bcopy(new_name, sdl->sdl_data, namelen);
sdl->sdl_nlen = namelen;
sdl = (struct sockaddr_dl *)ifa->ifa_netmask;
bzero(sdl->sdl_data, onamelen);
while (namelen != 0)
sdl->sdl_data[--namelen] = 0xff;
IFA_UNLOCK(ifa);
EVENTHANDLER_INVOKE(ifnet_arrival_event, ifp);
break;
case NGM_EIFACE_GET_IFADDRS:
{

1
sys/netgraph/ng_eiface.h
View file

@ -54,6 +54,7 @@ enum {
NGM_EIFACE_GET_IFNAME = 1, /* get the interface name */
NGM_EIFACE_GET_IFADDRS, /* returns list of addresses */
NGM_EIFACE_SET, /* set ethernet address */
NGM_EIFACE_SET_IFNAME,
};
#endif /* _NETGRAPH_NG_EIFACE_H_ */

58
sys/netgraph/ng_iface.c
View file

@ -70,9 +70,11 @@
#include <sys/socket.h>
#include <sys/syslog.h>
#include <sys/libkern.h>
#include <sys/ctype.h>
#include <net/if.h>
#include <net/if_types.h>
#include <net/if_dl.h>
#include <net/bpf.h>
#include <net/netisr.h>
#include <net/route.h>
@ -164,6 +166,13 @@ static const struct ng_cmdlist ng_iface_cmds[] = {
NULL,
&ng_parse_string_type
},
{
NGM_IFACE_COOKIE,
NGM_IFACE_SET_IFNAME,
"setifname",
&ng_parse_string_type,
NULL
},
{
NGM_IFACE_COOKIE,
NGM_IFACE_POINT2POINT,
@ -608,6 +617,10 @@ ng_iface_rcvmsg(node_p node, item_p item, hook_p lasthook)
struct ng_mesg *resp = NULL;
int error = 0;
struct ng_mesg *msg;
char *new_name;
size_t namelen, onamelen;
struct sockaddr_dl *sdl = NULL;
struct ifaddr *ifa = NULL;
NGI_GET_MSG(item, msg);
switch (msg->header.typecookie) {
@ -622,6 +635,49 @@ ng_iface_rcvmsg(node_p node, item_p item, hook_p lasthook)
strlcpy(resp->data, ifp->if_xname, IFNAMSIZ);
break;
case NGM_IFACE_SET_IFNAME:
new_name = (char *)msg->data;
/* Announce the departure of the interface. */
//new_name[strlen(new_name)] = '\0';
/* Deny request if interface is UP */
if ((ifp->if_flags & IFF_UP) != 0) {
error = EBUSY;
break;
}
//rt_ifannouncemsg(ifp, IFAN_DEPARTURE);
EVENTHANDLER_INVOKE(ifnet_departure_event, ifp);
strlcpy(ifp->if_xname, new_name, sizeof(ifp->if_xname));
ifa = ifp->if_addr;
IFA_LOCK(ifa);
sdl = (struct sockaddr_dl *)ifa->ifa_addr;
namelen = strlen(new_name) + 1;
onamelen = sdl->sdl_nlen;
/*
* Move the address if needed. This is safe because we
* allocate space for a name of length IFNAMSIZ when we
* create this in if_attach().
*/
if (namelen != onamelen) {
bcopy(sdl->sdl_data + onamelen,
sdl->sdl_data + namelen, sdl->sdl_alen);
}
bcopy(new_name, sdl->sdl_data, namelen);
sdl->sdl_nlen = namelen;
sdl = (struct sockaddr_dl *)ifa->ifa_netmask;
bzero(sdl->sdl_data, onamelen);
while (namelen != 0)
sdl->sdl_data[--namelen] = 0xff;
IFA_UNLOCK(ifa);
EVENTHANDLER_INVOKE(ifnet_arrival_event, ifp);
/* Announce the return of the interface. */
//rt_ifannouncemsg(ifp, IFAN_ARRIVAL);
break;
case NGM_IFACE_POINT2POINT:
case NGM_IFACE_BROADCAST:
{
@ -699,9 +755,11 @@ ng_iface_rcvmsg(node_p node, item_p item, hook_p lasthook)
switch (msg->header.cmd) {
case NGM_LINK_IS_UP:
ifp->if_drv_flags |= IFF_DRV_RUNNING;
if_link_state_change(ifp, LINK_STATE_UP);
break;
case NGM_LINK_IS_DOWN:
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
if_link_state_change(ifp, LINK_STATE_DOWN);
break;
default:
break;

1
sys/netgraph/ng_iface.h
View file

@ -70,6 +70,7 @@ enum {
NGM_IFACE_POINT2POINT,
NGM_IFACE_BROADCAST,
NGM_IFACE_GET_IFINDEX,
NGM_IFACE_SET_IFNAME,
};
#define MTAG_NGIF NGM_IFACE_COOKIE

1
sys/netgraph/ng_message.h
View file

@ -138,6 +138,7 @@ enum {
NGM_ASCII2BINARY= (13|NGM_READONLY|NGM_HASREPLY),
/* (optional) Get/set text config. */
NGM_TEXT_CONFIG = 14,
NGM_ETHER_ATTACH = 15,
};
/*

1
usr.sbin/ngctl/main.c
View file

@ -218,7 +218,6 @@ ReadFile(FILE *fp)
continue;
if ((rtn = DoParseCommand(line)) != 0) {
warnx("line %d: error in file", num);
return (rtn);
}
}
return (CMDRTN_OK);