aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/ppp/datalink.c
diff options
context:
space:
mode:
authorBrian Somers <brian@FreeBSD.org>1998-05-28 23:15:40 +0000
committerBrian Somers <brian@FreeBSD.org>1998-05-28 23:15:40 +0000
commit85fd273a31ef0aca118b98d6d326179123671de2 (patch)
treeadf70c9153773fff87da2ed681996c557481baaf /usr.sbin/ppp/datalink.c
parent389d403314335bcd573ea68dd7735200b5d9ede2 (diff)
downloadsrc-85fd273a31ef0aca118b98d6d326179123671de2.tar.gz
src-85fd273a31ef0aca118b98d6d326179123671de2.zip
o Don't forget to close our transfer socket if we cannot
generate the data to transfer. o Transfer uucp lock ownership for the transferred device. o Don't assume we know the correct values of dev_is_modem and mbits after the transfer.
Notes
Notes: svn path=/head/; revision=36450
Diffstat (limited to 'usr.sbin/ppp/datalink.c')
-rw-r--r--usr.sbin/ppp/datalink.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/ppp/datalink.c b/usr.sbin/ppp/datalink.c
index a41e93b79a14..c7eafab34b14 100644
--- a/usr.sbin/ppp/datalink.c
+++ b/usr.sbin/ppp/datalink.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: datalink.c,v 1.4 1998/05/23 22:24:33 brian Exp $
+ * $Id: datalink.c,v 1.5 1998/05/25 02:22:32 brian Exp $
*/
#include <sys/types.h>
@@ -1022,7 +1022,8 @@ iov2datalink(struct bundle *bundle, struct iovec *iov, int *niov, int maxiov,
}
int
-datalink2iov(struct datalink *dl, struct iovec *iov, int *niov, int maxiov)
+datalink2iov(struct datalink *dl, struct iovec *iov, int *niov, int maxiov,
+ pid_t newpid)
{
/* If `dl' is NULL, we're allocating before a Fromiov() */
int link_fd;
@@ -1048,7 +1049,7 @@ datalink2iov(struct datalink *dl, struct iovec *iov, int *niov, int maxiov)
dl ? realloc(dl->name, DATALINK_MAXNAME) : malloc(DATALINK_MAXNAME);
iov[(*niov)++].iov_len = DATALINK_MAXNAME;
- link_fd = modem2iov(dl ? dl->physical : NULL, iov, niov, maxiov);
+ link_fd = modem2iov(dl ? dl->physical : NULL, iov, niov, maxiov, newpid);
if (link_fd == -1 && dl) {
free(dl->name);