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

Remove some extraneous ifdefs, and don't try to put the socket in

Browse Source 
O_NONBLOCK.  The select() is the best best as I don't want to muck
about with the send/receive thresholds.
This commit is contained in:
Brian Somers 1999-11-16 21:57:48 +00:00
parent fdb4bb1b89
commit 02cfb3ba65
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=53242
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr.sbin/ppp/ether.c
View File

@ -53,9 +53,7 @@
#endif
#include <sys/uio.h>
#include <termios.h>
#ifndef NONBLOCK_FIXED
#include <sys/time.h>
#endif
#include <unistd.h>
#include "layer.h"
@ -204,21 +202,17 @@ ether_MessageIn(struct etherdevice *dev)
struct ngpppoe_sts *sts = (struct ngpppoe_sts *)(msgbuf + sizeof *rep);
char unknown[14];
const char *msg;
#ifndef NONBLOCK_FIXED
struct timeval t;
fd_set r;
#endif
if (dev->cs < 0)
return;
#ifndef NONBLOCK_FIXED
FD_ZERO(&r);
FD_SET(dev->cs, &r);
t.tv_sec = t.tv_usec = 0;
if (select(dev->cs + 1, &r, NULL, NULL, &t) <= 0)
return;
#endif
if (NgRecvMsg(dev->cs, rep, sizeof msgbuf, NULL) < 0)
return;
@ -407,7 +401,7 @@ ether_Create(struct physical *p)
struct ngm_connect ngc;
const char *iface, *provider;
char *path, etherid[12];
int ifacelen, providerlen, oldflag;
int ifacelen, providerlen;
char connectpath[sizeof dev->hook + 2]; /* .:<hook> */
p->fd--; /* We own the device - change fd */
@ -590,20 +584,6 @@ ether_Create(struct physical *p)
return ether_Abandon(dev, p);
}
/*
* Now make our control socket non-blocking so that we can read()
* without having to select()
*
* XXX: Does this work (#define NONBLOCK_FIXED) ?
*/
oldflag = fcntl(dev->cs, F_GETFL, 0);
if (oldflag < 0) {
log_Printf(LogWARN, "%s: Open: Cannot get physical flags: %s\n",
p->link.name, strerror(errno));
return ether_Abandon(dev, p);
} else
fcntl(dev->cs, F_SETFL, oldflag & ~O_NONBLOCK);
dev->timeout = p->cfg.cd.delay;
dev->connected = CARRIER_PENDING;