jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-04 01:38:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Clean up device handling WRT slip and ppp devices. An incomplete transition

Browse Source 
from one convention to another had things pretty fouled up in here.
This commit is contained in:
Jordan K. Hubbard 1997-01-04 13:29:10 +00:00
parent 6befaa491c
commit 719de2bced
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=21276
6 changed files with 99 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
release/sysinstall/devices.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next * This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite. * generation being essentially a complete rewrite.
* *
* $Id: devices.c,v 1.56 1996/12/26 21:03:04 jkh Exp $ * $Id: devices.c,v 1.57 1997/01/03 06:32:24 jkh Exp $
* *
* Copyright (c) 1995 * Copyright (c) 1995
* Jordan Hubbard. All rights reserved. * Jordan Hubbard. All rights reserved.
@ -76,8 +76,6 @@ static struct {
{ DEVICE_TYPE_NETWORK, "cuaa3", "%s on serial port 3 (COM4)" }, { DEVICE_TYPE_NETWORK, "cuaa3", "%s on serial port 3 (COM4)" },
{ DEVICE_TYPE_NETWORK, "lp0", "Parallel Port IP (PLIP) using laplink cable" }, { DEVICE_TYPE_NETWORK, "lp0", "Parallel Port IP (PLIP) using laplink cable" },
{ DEVICE_TYPE_NETWORK, "lo", "Loop-back (local) network interface" }, { DEVICE_TYPE_NETWORK, "lo", "Loop-back (local) network interface" },
{ DEVICE_TYPE_NETWORK, "sl", "Serial-line IP (SLIP) interface" },
{ DEVICE_TYPE_NETWORK, "ppp", "Point-to-Point Protocol (PPP) interface" },
{ DEVICE_TYPE_NETWORK, "de", "DEC DE435 PCI NIC or other DC21040-AA based card" }, { DEVICE_TYPE_NETWORK, "de", "DEC DE435 PCI NIC or other DC21040-AA based card" },
{ DEVICE_TYPE_NETWORK, "fxp", "Intel EtherExpress Pro/100B PCI Fast Ethernet card" }, { DEVICE_TYPE_NETWORK, "fxp", "Intel EtherExpress Pro/100B PCI Fast Ethernet card" },
{ DEVICE_TYPE_NETWORK, "ed", "WD/SMC 80xx; Novell NE1000/2000; 3Com 3C503 card" }, { DEVICE_TYPE_NETWORK, "ed", "WD/SMC 80xx; Novell NE1000/2000; 3Com 3C503 card" },
@ -177,6 +175,7 @@ deviceGetAll(void)
int ifflags; int ifflags;
char buffer[INTERFACE_MAX * sizeof(struct ifreq)]; char buffer[INTERFACE_MAX * sizeof(struct ifreq)];
char **names; char **names;
int supportSLIP = FALSE, supportPPP = FALSE;
/* Try and get the disks first */ /* Try and get the disks first */
if ((names = Disk_Names()) != NULL) { if ((names = Disk_Names()) != NULL) {
@ -234,9 +233,20 @@ deviceGetAll(void)
continue; continue;
/* Eliminate network devices that don't make sense */ /* Eliminate network devices that don't make sense */
if (!strncmp(ifptr->ifr_name, "tun", 3) || !strncmp(ifptr->ifr_name, "lo0", 3)) if (!strncmp(ifptr->ifr_name, "lo0", 3))
continue; continue;
/* If we have a slip device, don't register it but flag its support for later, when we do the serial devs */
if (!strncmp(ifptr->ifr_name, "sl", 2)) {
supportSLIP = TRUE;
continue;
}
/* And the same for ppp */
if (!strncmp(ifptr->ifr_name, "tun", 3) || !strncmp(ifptr->ifr_name, "ppp", 3)) {
supportPPP = TRUE;
continue;
}
/* Try and find its description */ /* Try and find its description */
for (i = 0, descr = NULL; device_names[i].name; i++) { for (i = 0, descr = NULL; device_names[i].name; i++) {
int len = strlen(device_names[i].name); int len = strlen(device_names[i].name);
@ -309,17 +319,22 @@ skipif:
char *newdesc, *cp; char *newdesc, *cp;
close(fd); close(fd);
/* Serial devices get a slip and ppp device each */
cp = device_names[i].description; cp = device_names[i].description;
newdesc = safe_malloc(strlen(cp) + 40); /* Serial devices get a slip and ppp device each, if supported */
sprintf(newdesc, cp, "SLIP interface"); if (supportSLIP) {
deviceRegister("sl0", newdesc, strdup(try), DEVICE_TYPE_NETWORK, TRUE, mediaInitNetwork, newdesc = safe_malloc(strlen(cp) + 40);
NULL, mediaShutdownNetwork, NULL); sprintf(newdesc, cp, "SLIP interface");
newdesc = safe_malloc(strlen(cp) + 50); deviceRegister("sl0", newdesc, strdup(try), DEVICE_TYPE_NETWORK, TRUE, mediaInitNetwork,
sprintf(newdesc, cp, "PPP interface"); NULL, mediaShutdownNetwork, NULL);
deviceRegister("ppp0", newdesc, strdup(try), DEVICE_TYPE_NETWORK, TRUE, mediaInitNetwork, msgDebug("Add mapping for %s on %s to sl0\n", device_names[i].name, try);
NULL, mediaShutdownNetwork, NULL); }
msgDebug("Found a serial network device named %s on %s\n", device_names[i].name, try); if (supportPPP) {
newdesc = safe_malloc(strlen(cp) + 50);
sprintf(newdesc, cp, "PPP interface");
deviceRegister("ppp0", newdesc, strdup(try), DEVICE_TYPE_NETWORK, TRUE, mediaInitNetwork,
NULL, mediaShutdownNetwork, NULL);
msgDebug("Add mapping for %s on %s to ppp0\n", device_names[i].name, try);
}
} }
break; break;
@ -340,7 +355,8 @@ deviceFind(char *name, DeviceType class)
static Device *found[DEV_MAX]; static Device *found[DEV_MAX];
int i, j; int i, j;
for (i = 0, j = 0; i < numDevs; i++) { j = 0;
for (i = 0; i < numDevs; i++) {
if ((!name || !strcmp(Devices[i]->name, name)) if ((!name || !strcmp(Devices[i]->name, name))
&& (class == DEVICE_TYPE_ANY || class == Devices[i]->type)) && (class == DEVICE_TYPE_ANY || class == Devices[i]->type))
found[j++] = Devices[i]; found[j++] = Devices[i];

4
release/sysinstall/sysinstall.h
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next * This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite. * generation being slated to essentially a complete rewrite.
* *
* $Id: sysinstall.h,v 1.96 1996/12/29 05:51:39 jkh Exp $ * $Id: sysinstall.h,v 1.97 1997/01/03 06:32:35 jkh Exp $
* *
* Copyright (c) 1995 * Copyright (c) 1995
* Jordan Hubbard. All rights reserved. * Jordan Hubbard. All rights reserved.
@ -57,7 +57,7 @@
/* Different packages we depend on - update this when package version change! */ /* Different packages we depend on - update this when package version change! */
#define PACKAGE_GATED "gated-3.5b3" #define PACKAGE_GATED "gated-3.5b3"
#define PACKAGE_APACHE "apache-1.1.1" #define PACKAGE_APACHE "apache-1.1.1"
#define PACKAGE_NETCON "commerce/netcon/bsd60" #define PACKAGE_NETCON "commerce/netcon/bsd61"
#define PACKAGE_PCNFSD "pcnfsd-93.02.16" #define PACKAGE_PCNFSD "pcnfsd-93.02.16"
#define PACKAGE_SAMBA "samba-1.9.15p8" #define PACKAGE_SAMBA "samba-1.9.15p8"
#define PACKAGE_LYNX "lynx-2.6" #define PACKAGE_LYNX "lynx-2.6"

46
usr.sbin/sade/devices.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next * This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite. * generation being essentially a complete rewrite.
* *
* $Id: devices.c,v 1.56 1996/12/26 21:03:04 jkh Exp $ * $Id: devices.c,v 1.57 1997/01/03 06:32:24 jkh Exp $
* *
* Copyright (c) 1995 * Copyright (c) 1995
* Jordan Hubbard. All rights reserved. * Jordan Hubbard. All rights reserved.
@ -76,8 +76,6 @@ static struct {
{ DEVICE_TYPE_NETWORK, "cuaa3", "%s on serial port 3 (COM4)" }, { DEVICE_TYPE_NETWORK, "cuaa3", "%s on serial port 3 (COM4)" },
{ DEVICE_TYPE_NETWORK, "lp0", "Parallel Port IP (PLIP) using laplink cable" }, { DEVICE_TYPE_NETWORK, "lp0", "Parallel Port IP (PLIP) using laplink cable" },
{ DEVICE_TYPE_NETWORK, "lo", "Loop-back (local) network interface" }, { DEVICE_TYPE_NETWORK, "lo", "Loop-back (local) network interface" },
{ DEVICE_TYPE_NETWORK, "sl", "Serial-line IP (SLIP) interface" },
{ DEVICE_TYPE_NETWORK, "ppp", "Point-to-Point Protocol (PPP) interface" },
{ DEVICE_TYPE_NETWORK, "de", "DEC DE435 PCI NIC or other DC21040-AA based card" }, { DEVICE_TYPE_NETWORK, "de", "DEC DE435 PCI NIC or other DC21040-AA based card" },
{ DEVICE_TYPE_NETWORK, "fxp", "Intel EtherExpress Pro/100B PCI Fast Ethernet card" }, { DEVICE_TYPE_NETWORK, "fxp", "Intel EtherExpress Pro/100B PCI Fast Ethernet card" },
{ DEVICE_TYPE_NETWORK, "ed", "WD/SMC 80xx; Novell NE1000/2000; 3Com 3C503 card" }, { DEVICE_TYPE_NETWORK, "ed", "WD/SMC 80xx; Novell NE1000/2000; 3Com 3C503 card" },
@ -177,6 +175,7 @@ deviceGetAll(void)
int ifflags; int ifflags;
char buffer[INTERFACE_MAX * sizeof(struct ifreq)]; char buffer[INTERFACE_MAX * sizeof(struct ifreq)];
char **names; char **names;
int supportSLIP = FALSE, supportPPP = FALSE;
/* Try and get the disks first */ /* Try and get the disks first */
if ((names = Disk_Names()) != NULL) { if ((names = Disk_Names()) != NULL) {
@ -234,9 +233,20 @@ deviceGetAll(void)
continue; continue;
/* Eliminate network devices that don't make sense */ /* Eliminate network devices that don't make sense */
if (!strncmp(ifptr->ifr_name, "tun", 3) || !strncmp(ifptr->ifr_name, "lo0", 3)) if (!strncmp(ifptr->ifr_name, "lo0", 3))
continue; continue;
/* If we have a slip device, don't register it but flag its support for later, when we do the serial devs */
if (!strncmp(ifptr->ifr_name, "sl", 2)) {
supportSLIP = TRUE;
continue;
}
/* And the same for ppp */
if (!strncmp(ifptr->ifr_name, "tun", 3) || !strncmp(ifptr->ifr_name, "ppp", 3)) {
supportPPP = TRUE;
continue;
}
/* Try and find its description */ /* Try and find its description */
for (i = 0, descr = NULL; device_names[i].name; i++) { for (i = 0, descr = NULL; device_names[i].name; i++) {
int len = strlen(device_names[i].name); int len = strlen(device_names[i].name);
@ -309,17 +319,22 @@ skipif:
char *newdesc, *cp; char *newdesc, *cp;
close(fd); close(fd);
/* Serial devices get a slip and ppp device each */
cp = device_names[i].description; cp = device_names[i].description;
newdesc = safe_malloc(strlen(cp) + 40); /* Serial devices get a slip and ppp device each, if supported */
sprintf(newdesc, cp, "SLIP interface"); if (supportSLIP) {
deviceRegister("sl0", newdesc, strdup(try), DEVICE_TYPE_NETWORK, TRUE, mediaInitNetwork, newdesc = safe_malloc(strlen(cp) + 40);
NULL, mediaShutdownNetwork, NULL); sprintf(newdesc, cp, "SLIP interface");
newdesc = safe_malloc(strlen(cp) + 50); deviceRegister("sl0", newdesc, strdup(try), DEVICE_TYPE_NETWORK, TRUE, mediaInitNetwork,
sprintf(newdesc, cp, "PPP interface"); NULL, mediaShutdownNetwork, NULL);
deviceRegister("ppp0", newdesc, strdup(try), DEVICE_TYPE_NETWORK, TRUE, mediaInitNetwork, msgDebug("Add mapping for %s on %s to sl0\n", device_names[i].name, try);
NULL, mediaShutdownNetwork, NULL); }
msgDebug("Found a serial network device named %s on %s\n", device_names[i].name, try); if (supportPPP) {
newdesc = safe_malloc(strlen(cp) + 50);
sprintf(newdesc, cp, "PPP interface");
deviceRegister("ppp0", newdesc, strdup(try), DEVICE_TYPE_NETWORK, TRUE, mediaInitNetwork,
NULL, mediaShutdownNetwork, NULL);
msgDebug("Add mapping for %s on %s to ppp0\n", device_names[i].name, try);
}
} }
break; break;
@ -340,7 +355,8 @@ deviceFind(char *name, DeviceType class)
static Device *found[DEV_MAX]; static Device *found[DEV_MAX];
int i, j; int i, j;
for (i = 0, j = 0; i < numDevs; i++) { j = 0;
for (i = 0; i < numDevs; i++) {
if ((!name || !strcmp(Devices[i]->name, name)) if ((!name || !strcmp(Devices[i]->name, name))
&& (class == DEVICE_TYPE_ANY || class == Devices[i]->type)) && (class == DEVICE_TYPE_ANY || class == Devices[i]->type))
found[j++] = Devices[i]; found[j++] = Devices[i];

4
usr.sbin/sade/sade.h
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next * This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite. * generation being slated to essentially a complete rewrite.
* *
* $Id: sysinstall.h,v 1.96 1996/12/29 05:51:39 jkh Exp $ * $Id: sysinstall.h,v 1.97 1997/01/03 06:32:35 jkh Exp $
* *
* Copyright (c) 1995 * Copyright (c) 1995
* Jordan Hubbard. All rights reserved. * Jordan Hubbard. All rights reserved.
@ -57,7 +57,7 @@
/* Different packages we depend on - update this when package version change! */ /* Different packages we depend on - update this when package version change! */
#define PACKAGE_GATED "gated-3.5b3" #define PACKAGE_GATED "gated-3.5b3"
#define PACKAGE_APACHE "apache-1.1.1" #define PACKAGE_APACHE "apache-1.1.1"
#define PACKAGE_NETCON "commerce/netcon/bsd60" #define PACKAGE_NETCON "commerce/netcon/bsd61"
#define PACKAGE_PCNFSD "pcnfsd-93.02.16" #define PACKAGE_PCNFSD "pcnfsd-93.02.16"
#define PACKAGE_SAMBA "samba-1.9.15p8" #define PACKAGE_SAMBA "samba-1.9.15p8"
#define PACKAGE_LYNX "lynx-2.6" #define PACKAGE_LYNX "lynx-2.6"

46
usr.sbin/sysinstall/devices.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next * This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite. * generation being essentially a complete rewrite.
* *
* $Id: devices.c,v 1.56 1996/12/26 21:03:04 jkh Exp $ * $Id: devices.c,v 1.57 1997/01/03 06:32:24 jkh Exp $
* *
* Copyright (c) 1995 * Copyright (c) 1995
* Jordan Hubbard. All rights reserved. * Jordan Hubbard. All rights reserved.
@ -76,8 +76,6 @@ static struct {
{ DEVICE_TYPE_NETWORK, "cuaa3", "%s on serial port 3 (COM4)" }, { DEVICE_TYPE_NETWORK, "cuaa3", "%s on serial port 3 (COM4)" },
{ DEVICE_TYPE_NETWORK, "lp0", "Parallel Port IP (PLIP) using laplink cable" }, { DEVICE_TYPE_NETWORK, "lp0", "Parallel Port IP (PLIP) using laplink cable" },
{ DEVICE_TYPE_NETWORK, "lo", "Loop-back (local) network interface" }, { DEVICE_TYPE_NETWORK, "lo", "Loop-back (local) network interface" },
{ DEVICE_TYPE_NETWORK, "sl", "Serial-line IP (SLIP) interface" },
{ DEVICE_TYPE_NETWORK, "ppp", "Point-to-Point Protocol (PPP) interface" },
{ DEVICE_TYPE_NETWORK, "de", "DEC DE435 PCI NIC or other DC21040-AA based card" }, { DEVICE_TYPE_NETWORK, "de", "DEC DE435 PCI NIC or other DC21040-AA based card" },
{ DEVICE_TYPE_NETWORK, "fxp", "Intel EtherExpress Pro/100B PCI Fast Ethernet card" }, { DEVICE_TYPE_NETWORK, "fxp", "Intel EtherExpress Pro/100B PCI Fast Ethernet card" },
{ DEVICE_TYPE_NETWORK, "ed", "WD/SMC 80xx; Novell NE1000/2000; 3Com 3C503 card" }, { DEVICE_TYPE_NETWORK, "ed", "WD/SMC 80xx; Novell NE1000/2000; 3Com 3C503 card" },
@ -177,6 +175,7 @@ deviceGetAll(void)
int ifflags; int ifflags;
char buffer[INTERFACE_MAX * sizeof(struct ifreq)]; char buffer[INTERFACE_MAX * sizeof(struct ifreq)];
char **names; char **names;
int supportSLIP = FALSE, supportPPP = FALSE;
/* Try and get the disks first */ /* Try and get the disks first */
if ((names = Disk_Names()) != NULL) { if ((names = Disk_Names()) != NULL) {
@ -234,9 +233,20 @@ deviceGetAll(void)
continue; continue;
/* Eliminate network devices that don't make sense */ /* Eliminate network devices that don't make sense */
if (!strncmp(ifptr->ifr_name, "tun", 3) || !strncmp(ifptr->ifr_name, "lo0", 3)) if (!strncmp(ifptr->ifr_name, "lo0", 3))
continue; continue;
/* If we have a slip device, don't register it but flag its support for later, when we do the serial devs */
if (!strncmp(ifptr->ifr_name, "sl", 2)) {
supportSLIP = TRUE;
continue;
}
/* And the same for ppp */
if (!strncmp(ifptr->ifr_name, "tun", 3) || !strncmp(ifptr->ifr_name, "ppp", 3)) {
supportPPP = TRUE;
continue;
}
/* Try and find its description */ /* Try and find its description */
for (i = 0, descr = NULL; device_names[i].name; i++) { for (i = 0, descr = NULL; device_names[i].name; i++) {
int len = strlen(device_names[i].name); int len = strlen(device_names[i].name);
@ -309,17 +319,22 @@ skipif:
char *newdesc, *cp; char *newdesc, *cp;
close(fd); close(fd);
/* Serial devices get a slip and ppp device each */
cp = device_names[i].description; cp = device_names[i].description;
newdesc = safe_malloc(strlen(cp) + 40); /* Serial devices get a slip and ppp device each, if supported */
sprintf(newdesc, cp, "SLIP interface"); if (supportSLIP) {
deviceRegister("sl0", newdesc, strdup(try), DEVICE_TYPE_NETWORK, TRUE, mediaInitNetwork, newdesc = safe_malloc(strlen(cp) + 40);
NULL, mediaShutdownNetwork, NULL); sprintf(newdesc, cp, "SLIP interface");
newdesc = safe_malloc(strlen(cp) + 50); deviceRegister("sl0", newdesc, strdup(try), DEVICE_TYPE_NETWORK, TRUE, mediaInitNetwork,
sprintf(newdesc, cp, "PPP interface"); NULL, mediaShutdownNetwork, NULL);
deviceRegister("ppp0", newdesc, strdup(try), DEVICE_TYPE_NETWORK, TRUE, mediaInitNetwork, msgDebug("Add mapping for %s on %s to sl0\n", device_names[i].name, try);
NULL, mediaShutdownNetwork, NULL); }
msgDebug("Found a serial network device named %s on %s\n", device_names[i].name, try); if (supportPPP) {
newdesc = safe_malloc(strlen(cp) + 50);
sprintf(newdesc, cp, "PPP interface");
deviceRegister("ppp0", newdesc, strdup(try), DEVICE_TYPE_NETWORK, TRUE, mediaInitNetwork,
NULL, mediaShutdownNetwork, NULL);
msgDebug("Add mapping for %s on %s to ppp0\n", device_names[i].name, try);
}
} }
break; break;
@ -340,7 +355,8 @@ deviceFind(char *name, DeviceType class)
static Device *found[DEV_MAX]; static Device *found[DEV_MAX];
int i, j; int i, j;
for (i = 0, j = 0; i < numDevs; i++) { j = 0;
for (i = 0; i < numDevs; i++) {
if ((!name || !strcmp(Devices[i]->name, name)) if ((!name || !strcmp(Devices[i]->name, name))
&& (class == DEVICE_TYPE_ANY || class == Devices[i]->type)) && (class == DEVICE_TYPE_ANY || class == Devices[i]->type))
found[j++] = Devices[i]; found[j++] = Devices[i];

4
usr.sbin/sysinstall/sysinstall.h
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next * This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite. * generation being slated to essentially a complete rewrite.
* *
* $Id: sysinstall.h,v 1.96 1996/12/29 05:51:39 jkh Exp $ * $Id: sysinstall.h,v 1.97 1997/01/03 06:32:35 jkh Exp $
* *
* Copyright (c) 1995 * Copyright (c) 1995
* Jordan Hubbard. All rights reserved. * Jordan Hubbard. All rights reserved.
@ -57,7 +57,7 @@
/* Different packages we depend on - update this when package version change! */ /* Different packages we depend on - update this when package version change! */
#define PACKAGE_GATED "gated-3.5b3" #define PACKAGE_GATED "gated-3.5b3"
#define PACKAGE_APACHE "apache-1.1.1" #define PACKAGE_APACHE "apache-1.1.1"
#define PACKAGE_NETCON "commerce/netcon/bsd60" #define PACKAGE_NETCON "commerce/netcon/bsd61"
#define PACKAGE_PCNFSD "pcnfsd-93.02.16" #define PACKAGE_PCNFSD "pcnfsd-93.02.16"
#define PACKAGE_SAMBA "samba-1.9.15p8" #define PACKAGE_SAMBA "samba-1.9.15p8"
#define PACKAGE_LYNX "lynx-2.6" #define PACKAGE_LYNX "lynx-2.6"