Deleted Added
sdiff udiff text old ( 105825 ) new ( 138593 )
full compact
ifmac.c (105825) ifmac.c (138593)
1/*-
2 * Copyright (c) 2001 Networks Associates Technology, Inc.
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project by NAI Labs, the
6 * Security Research Division of Network Associates, Inc. under
7 * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA
8 * CHATS research program.

--- 17 unchanged lines hidden (view full) ---

26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
1/*-
2 * Copyright (c) 2001 Networks Associates Technology, Inc.
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project by NAI Labs, the
6 * Security Research Division of Network Associates, Inc. under
7 * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA
8 * CHATS research program.

--- 17 unchanged lines hidden (view full) ---

26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * $FreeBSD: head/sbin/ifconfig/ifmac.c 105825 2002-10-23 22:50:04Z rwatson $
34 * $FreeBSD: head/sbin/ifconfig/ifmac.c 138593 2004-12-08 19:18:07Z sam $
35 */
36
37#include <sys/param.h>
38#include <sys/ioctl.h>
39#include <sys/mac.h>
40#include <sys/socket.h>
41#include <sys/sockio.h>
42
43#include <net/if.h>
44#include <net/route.h>
45
46#include <stdio.h>
47#include <stdlib.h>
48#include <string.h>
49
50#include "ifconfig.h"
51
35 */
36
37#include <sys/param.h>
38#include <sys/ioctl.h>
39#include <sys/mac.h>
40#include <sys/socket.h>
41#include <sys/sockio.h>
42
43#include <net/if.h>
44#include <net/route.h>
45
46#include <stdio.h>
47#include <stdlib.h>
48#include <string.h>
49
50#include "ifconfig.h"
51
52void
53maclabel_status(int s, struct rt_addrinfo *info)
52static void
53maclabel_status(int s, const struct rt_addrinfo *info)
54{
55 struct ifreq ifr;
56 mac_t label;
57 char *label_text;
58
59 memset(&ifr, 0, sizeof(ifr));
60 strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
61

--- 10 unchanged lines hidden (view full) ---

72 if (strlen(label_text) != 0)
73 printf("\tmaclabel %s\n", label_text);
74 free(label_text);
75
76mac_free:
77 mac_free(label);
78}
79
54{
55 struct ifreq ifr;
56 mac_t label;
57 char *label_text;
58
59 memset(&ifr, 0, sizeof(ifr));
60 strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
61

--- 10 unchanged lines hidden (view full) ---

72 if (strlen(label_text) != 0)
73 printf("\tmaclabel %s\n", label_text);
74 free(label_text);
75
76mac_free:
77 mac_free(label);
78}
79
80void
80static void
81setifmaclabel(const char *val, int d, int s, const struct afswtch *rafp)
82{
83 struct ifreq ifr;
84 mac_t label;
85 int error;
86
87 if (mac_from_text(&label, val) == -1) {
88 perror(val);

--- 4 unchanged lines hidden (view full) ---

93 strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
94 ifr.ifr_ifru.ifru_data = (void *)label;
95
96 error = ioctl(s, SIOCSIFMAC, &ifr);
97 mac_free(label);
98 if (error == -1)
99 perror("setifmac");
100}
81setifmaclabel(const char *val, int d, int s, const struct afswtch *rafp)
82{
83 struct ifreq ifr;
84 mac_t label;
85 int error;
86
87 if (mac_from_text(&label, val) == -1) {
88 perror(val);

--- 4 unchanged lines hidden (view full) ---

93 strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
94 ifr.ifr_ifru.ifru_data = (void *)label;
95
96 error = ioctl(s, SIOCSIFMAC, &ifr);
97 mac_free(label);
98 if (error == -1)
99 perror("setifmac");
100}
101
102static struct cmd mac_cmds[] = {
103 DEF_CMD_ARG("maclabel", setifmaclabel),
104};
105static struct afswtch af_mac = {
106 .af_name = "af_maclabel",
107 .af_af = AF_UNSPEC,
108 .af_status = maclabel_status,
109};
110
111static __constructor void
112mac_ctor(void)
113{
114#define N(a) (sizeof(a) / sizeof(a[0]))
115 int i;
116
117 for (i = 0; i < N(mac_cmds); i++)
118 cmd_register(&mac_cmds[i]);
119 af_register(&af_mac);
120#undef N
121}