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

Don't try to do a DIALOUT in -direct mode or if there's no phone

Browse Source 
numbers set.
This commit is contained in:
Brian Somers 1999-11-28 15:50:23 +00:00
parent f6a4e748a9
commit 97536b3bb8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=53831
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.sbin/ppp/i4b.c
View File

@ -339,7 +339,7 @@ struct device *
i4b_Create(struct physical *p)
{
struct i4bdevice *dev;
int oldflag;
int oldflag, dial;
msg_vr_req_t req;
telno_t number;
@ -357,9 +357,12 @@ i4b_Create(struct physical *p)
log_Printf(LogDEBUG, "%s: Input is an i4b version %d.%d.%d isdn "
"device (%s)\n", p->link.name, req.version, req.release,
req.step, p->name.full);
} else
dial = 0;
} else {
log_Printf(LogDEBUG, "%s: Opened %s (i4b version %d.%d.%d)\n",
p->link.name, p->name.full, req.version, req.release, req.step);
dial = 1;
}
/* We're gonna return an i4bdevice (unless something goes horribly wrong) */
@ -402,9 +405,13 @@ i4b_Create(struct physical *p)
} else
fcntl(p->fd, F_SETFL, oldflag & ~O_NONBLOCK);
strncpy(number, datalink_ChoosePhoneNumber(p->dl), sizeof number - 1);
number[sizeof number - 1] = '\0';
if (ioctl(p->fd, I4B_RBCH_DIALOUT, number) == -1) {
if (dial) {
strncpy(number, datalink_ChoosePhoneNumber(p->dl), sizeof number - 1);
number[sizeof number - 1] = '\0';
if (number[0] == '\0')
dial = 0;
}
if (dial && ioctl(p->fd, I4B_RBCH_DIALOUT, number) == -1) {
/* Complete failure - parent doesn't continue trying to ``create'' */
log_Printf(LogWARN, "%s: ioctl(I4B_RBCH_DIALOUT): %s\n",