d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the code for tweaking interface flags into one function.

Browse Source
This commit is contained in:
Brian Somers 1999-05-27 08:42:17 +00:00
parent 8be70a6eac
commit 4e5196e9dc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=47538
3 changed files with 62 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
usr.sbin/ppp/bundle.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: bundle.c,v 1.52 1999/05/08 11:06:08 brian Exp $
* $Id: bundle.c,v 1.53 1999/05/12 09:48:41 brian Exp $
*/
#include <sys/param.h>
@ -719,10 +719,9 @@ bundle_UnlockTun(struct bundle *bundle)
struct bundle *
bundle_Create(const char *prefix, int type, const char **argv)
{
int s, enoentcount, err;
const char *ifname;
struct ifreq ifrq;
static struct bundle bundle; /* there can be only one */
int enoentcount, err;
const char *ifname;
#ifdef TUNSIFMODE
int iff;
#endif
@ -761,13 +760,6 @@ bundle_Create(const char *prefix, int type, const char **argv)
bundle.argv0 = argv[0];
bundle.argv1 = argv[1];
s = socket(AF_INET, SOCK_DGRAM, 0);
if (s < 0) {
log_Printf(LogERROR, "bundle_Create: socket(): %s\n", strerror(errno));
close(bundle.dev.fd);
return NULL;
}
ifname = strrchr(bundle.dev.Name, '/');
if (ifname == NULL)
ifname = bundle.dev.Name;
@ -776,7 +768,6 @@ bundle_Create(const char *prefix, int type, const char **argv)
bundle.iface = iface_Create(ifname);
if (bundle.iface == NULL) {
close(s);
close(bundle.dev.fd);
return NULL;
}
@ -789,38 +780,16 @@ bundle_Create(const char *prefix, int type, const char **argv)
strerror(errno));
#endif
/*
* Now, bring up the interface.
*/
memset(&ifrq, '\0', sizeof ifrq);
strncpy(ifrq.ifr_name, ifname, sizeof ifrq.ifr_name - 1);
ifrq.ifr_name[sizeof ifrq.ifr_name - 1] = '\0';
if (ID0ioctl(s, SIOCGIFFLAGS, &ifrq) < 0) {
log_Printf(LogERROR, "bundle_Create: ioctl(SIOCGIFFLAGS): %s\n",
strerror(errno));
close(s);
if (!iface_SetFlags(bundle.iface, IFF_UP)) {
iface_Destroy(bundle.iface);
bundle.iface = NULL;
close(bundle.dev.fd);
return NULL;
}
ifrq.ifr_flags |= IFF_UP;
if (ID0ioctl(s, SIOCSIFFLAGS, &ifrq) < 0) {
log_Printf(LogERROR, "bundle_Create: ioctl(SIOCSIFFLAGS): %s\n",
strerror(errno));
close(s);
iface_Destroy(bundle.iface);
bundle.iface = NULL;
close(bundle.dev.fd);
return NULL;
}
close(s);
log_Printf(LogPHASE, "Using interface: %s\n", ifname);
bundle.ifSpeed = 0;
bundle.routing_seq = 0;
bundle.phase = PHASE_DEAD;
bundle.CleaningUp = 0;
@ -899,34 +868,8 @@ bundle_Create(const char *prefix, int type, const char **argv)
static void
bundle_DownInterface(struct bundle *bundle)
{
struct ifreq ifrq;
int s;
route_IfDelete(bundle, 1);
s = ID0socket(AF_INET, SOCK_DGRAM, 0);
if (s < 0) {
log_Printf(LogERROR, "bundle_DownInterface: socket: %s\n", strerror(errno));
return;
}
memset(&ifrq, '\0', sizeof ifrq);
strncpy(ifrq.ifr_name, bundle->iface->name, sizeof ifrq.ifr_name - 1);
ifrq.ifr_name[sizeof ifrq.ifr_name - 1] = '\0';
if (ID0ioctl(s, SIOCGIFFLAGS, &ifrq) < 0) {
log_Printf(LogERROR, "bundle_DownInterface: ioctl(SIOCGIFFLAGS): %s\n",
strerror(errno));
close(s);
return;
}
ifrq.ifr_flags &= ~IFF_UP;
if (ID0ioctl(s, SIOCSIFFLAGS, &ifrq) < 0) {
log_Printf(LogERROR, "bundle_DownInterface: ioctl(SIOCSIFFLAGS): %s\n",
strerror(errno));
close(s);
return;
}
close(s);
iface_ClearFlags(bundle->iface, IFF_UP);
}
void

55
usr.sbin/ppp/iface.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: iface.c,v 1.4 1999/04/26 08:54:24 brian Exp $
* $Id: iface.c,v 1.5 1999/05/08 11:06:40 brian Exp $
*/
#include <sys/param.h>
@ -406,6 +406,59 @@ iface_inDelete(struct iface *iface, struct in_addr ip)
return 0;
}
#define IFACE_ADDFLAGS 1
#define IFACE_DELFLAGS 2
static int
iface_ChangeFlags(struct iface *iface, int flags, int how)
{
struct ifreq ifrq;
int s;
s = ID0socket(AF_INET, SOCK_DGRAM, 0);
if (s < 0) {
log_Printf(LogERROR, "iface_ClearFlags: socket: %s\n", strerror(errno));
return 0;
}
memset(&ifrq, '\0', sizeof ifrq);
strncpy(ifrq.ifr_name, iface->name, sizeof ifrq.ifr_name - 1);
ifrq.ifr_name[sizeof ifrq.ifr_name - 1] = '\0';
if (ID0ioctl(s, SIOCGIFFLAGS, &ifrq) < 0) {
log_Printf(LogERROR, "iface_ClearFlags: ioctl(SIOCGIFFLAGS): %s\n",
strerror(errno));
close(s);
return 0;
}
if (how == IFACE_ADDFLAGS)
ifrq.ifr_flags |= flags;
else
ifrq.ifr_flags &= ~flags;
if (ID0ioctl(s, SIOCSIFFLAGS, &ifrq) < 0) {
log_Printf(LogERROR, "iface_ClearFlags: ioctl(SIOCSIFFLAGS): %s\n",
strerror(errno));
close(s);
return 0;
}
close(s);
return 1; /* Success */
}
int
iface_SetFlags(struct iface *iface, int flags)
{
return iface_ChangeFlags(iface, flags, IFACE_ADDFLAGS);
}
int
iface_ClearFlags(struct iface *iface, int flags)
{
return iface_ChangeFlags(iface, flags, IFACE_DELFLAGS);
}
void
iface_Destroy(struct iface *iface)
{

4
usr.sbin/ppp/iface.h
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id:$
* $Id: iface.h,v 1.1 1998/10/22 02:32:49 brian Exp $
*/
struct iface_addr {
@ -57,4 +57,6 @@ extern int iface_inAdd(struct iface *, struct in_addr, struct in_addr,
struct in_addr, int);
extern int iface_inDelete(struct iface *, struct in_addr);
extern int iface_Show(struct cmdargs const *);
extern int iface_SetFlags(struct iface *, int);
extern int iface_ClearFlags(struct iface *, int);
extern void iface_Destroy(struct iface *);