Deleted Added
full compact
ifconfig.c (206637) ifconfig.c (210936)
1/*
2 * Copyright (c) 1983, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

33 The Regents of the University of California. All rights reserved.\n";
34#endif /* not lint */
35
36#ifndef lint
37#if 0
38static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";
39#endif
40static const char rcsid[] =
1/*
2 * Copyright (c) 1983, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

33 The Regents of the University of California. All rights reserved.\n";
34#endif /* not lint */
35
36#ifndef lint
37#if 0
38static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";
39#endif
40static const char rcsid[] =
41 "$FreeBSD: head/sbin/ifconfig/ifconfig.c 206637 2010-04-14 22:02:19Z delphij $";
41 "$FreeBSD: head/sbin/ifconfig/ifconfig.c 210936 2010-08-06 15:09:21Z jhb $";
42#endif /* not lint */
43
44#include <sys/param.h>
45#include <sys/ioctl.h>
46#include <sys/socket.h>
47#include <sys/time.h>
48#include <sys/module.h>
49#include <sys/linker.h>

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

314 */
315 if (namesonly) {
316 if (namecp == cp)
317 continue;
318 if (afp != NULL) {
319 /* special case for "ether" address family */
320 if (!strcmp(afp->af_name, "ether")) {
321 if (sdl == NULL ||
42#endif /* not lint */
43
44#include <sys/param.h>
45#include <sys/ioctl.h>
46#include <sys/socket.h>
47#include <sys/time.h>
48#include <sys/module.h>
49#include <sys/linker.h>

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

314 */
315 if (namesonly) {
316 if (namecp == cp)
317 continue;
318 if (afp != NULL) {
319 /* special case for "ether" address family */
320 if (!strcmp(afp->af_name, "ether")) {
321 if (sdl == NULL ||
322 sdl->sdl_type != IFT_ETHER ||
322 (sdl->sdl_type != IFT_ETHER &&
323 sdl->sdl_type != IFT_L2VLAN &&
324 sdl->sdl_type != IFT_BRIDGE) ||
323 sdl->sdl_alen != ETHER_ADDR_LEN)
324 continue;
325 } else {
326 if (ifa->ifa_addr->sa_family != afp->af_af)
327 continue;
328 }
329 }
330 namecp = cp;

--- 850 unchanged lines hidden ---
325 sdl->sdl_alen != ETHER_ADDR_LEN)
326 continue;
327 } else {
328 if (ifa->ifa_addr->sa_family != afp->af_af)
329 continue;
330 }
331 }
332 namecp = cp;

--- 850 unchanged lines hidden ---