[Vtun-Commit] CVS: 6 files have been modified in vtun/generic.
Status: Inactive
Brought to you by:
mtbishop
|
From: Bishop <mtb...@us...> - 2006-12-11 07:55:36
|
The following files were modified in vtun/generic:
Name Old version New version Comment
---- ----------- ----------- -------
pipe_dev.c 1.3 1.4=20=20=20=20=20=20=20=20=20=20=20=20=20
pty_dev.c 1.3 1.4=20=20=20=20=20=20=20=20=20=20=20=20=20
tap_dev.c 1.4 1.5=20=20=20=20=20=20=20=20=20=20=20=20=20
tcp_proto.c 1.6 1.7=20=20=20=20=20=20=20=20=20=20=20=20=20
tun_dev.c 1.4 1.5=20=20=20=20=20=20=20=20=20=20=20=20=20
udp_proto.c 1.9 1.10=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Merging 3.0 devel back into HEAD
The diff of the modified file(s):
--- pipe_dev.c 22 Jan 2002 09:53:00 -0000 1.3
+++ pipe_dev.c 11 Dec 2006 07:55:06 -0000 1.4
@@ -17,7 +17,7 @@
*/
=20
/*
- * pipe_dev.c,v 1.2 2001/09/20 06:26:41 talby Exp
+ * pipe_dev.c,v 1.1.1.1.2.1.2.1 2006/11/16 04:04:26 mtbishop Exp
*/
=20
#include "config.h"
--- pty_dev.c 22 Jan 2002 09:53:00 -0000 1.3
+++ pty_dev.c 11 Dec 2006 07:55:06 -0000 1.4
@@ -17,7 +17,7 @@
*/
=20
/*
- * pty_dev.c,v 1.2 2001/09/20 06:26:41 talby Exp
+ * pty_dev.c,v 1.1.1.1.2.3.2.1 2006/11/16 04:04:29 mtbishop Exp
*/
=20
#include "config.h"
@@ -38,11 +38,27 @@
*/
int pty_open(char *sl_name)
{
+ int mr_fd;
+#if defined (HAVE_GETPT) && defined (HAVE_GRANTPT) && defined (HAVE_UNLOCK=
PT) && defined (HAVE_PTSNAME)
+ char *ptyname;
+
+ if((mr_fd=3Dgetpt()) < 0)
+ return -1;
+ if(grantpt(mr_fd) !=3D 0)
+ return -1;
+ if(unlockpt(mr_fd) !=3D 0)
+ return -1;
+ if ((ptyname =3D (char*)ptsname(mr_fd)) =3D=3D NULL)
+ return -1;
+ strcpy(sl_name, ptyname);
+ return mr_fd;
+
+#else
+
char ptyname[] =3D "/dev/ptyXY";
char ch[] =3D "pqrstuvwxyz";
char digit[] =3D "0123456789abcdefghijklmnopqrstuv";
int l, m;
- int mr_fd;
=20
/* This algorithm should work for almost all standard Unices */
for (l =3D 0; ch[l]; l++) {
@@ -64,6 +80,7 @@
}
}
return -1;
+#endif
}
=20
/* Write frames to PTY device */
--- tap_dev.c 22 Jan 2002 09:53:00 -0000 1.4
+++ tap_dev.c 11 Dec 2006 07:55:06 -0000 1.5
@@ -17,7 +17,7 @@
*/
=20
/*
- * tap_dev.c,v 1.3 2001/09/20 06:26:41 talby Exp
+ * tap_dev.c,v 1.2.2.1.2.1 2006/11/16 04:04:32 mtbishop Exp
*/
=20
#include "config.h"
--- tcp_proto.c 22 Jan 2002 09:53:00 -0000 1.6
+++ tcp_proto.c 11 Dec 2006 07:55:06 -0000 1.7
@@ -17,7 +17,7 @@
*/
=20
/*
- * tcp_proto.c,v 1.5 2001/09/20 06:26:41 talby Exp
+ * tcp_proto.c,v 1.4.2.3.2.1 2006/11/16 04:04:35 mtbishop Exp
*/
=20
#include "config.h"
--- tun_dev.c 22 Jan 2002 09:53:00 -0000 1.4
+++ tun_dev.c 11 Dec 2006 07:55:06 -0000 1.5
@@ -17,7 +17,7 @@
*/
=20
/*
- * tun_dev.c,v 1.3 2001/09/20 06:26:41 talby Exp
+ * tun_dev.c,v 1.2.2.1.2.1 2006/11/16 04:04:40 mtbishop Exp
*/
=20
#include "config.h"
--- udp_proto.c 15 Dec 2002 19:30:42 -0000 1.9
+++ udp_proto.c 11 Dec 2006 07:55:06 -0000 1.10
@@ -17,7 +17,7 @@
*/
=20
/*
- * udp_proto.c,v 1.6 2001/09/20 06:26:41 talby Exp
+ * udp_proto.c,v 1.5.2.3.2.1 2006/11/16 04:04:43 mtbishop Exp
*/
=20
#include "config.h"
|