1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
diff -ur dist/pptp-linux-1.0.3/pptp.c work/pptp-linux-1.0.3/pptp.c
--- dist/pptp-linux-1.0.3/pptp.c Mon Apr 30 05:42:36 2001
+++ pptp.c Thu May 10 00:43:02 2001
@@ -7,7 +7,11 @@
#include <sys/types.h>
#include <sys/socket.h>
+#ifdef __FreeBSD__
+#include <libutil.h>
+#else
#include <pty.h>
+#endif
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/un.h>
@@ -19,14 +23,15 @@
#include <signal.h>
#include <setjmp.h>
#include <errno.h>
+#include <fcntl.h>
#include <sys/wait.h>
+#include <limits.h>
#include <getopt.h>
#include "pptp_callmgr.h"
#include "pptp_gre.h"
#include "version.h"
#include "inststr.h"
#include "util.h"
-#include "pty.h"
#ifndef PPPD_BINARY
#define PPPD_BINARY "pppd"
@@ -64,7 +69,7 @@
int main(int argc, char **argv, char **envp) {
struct in_addr inetaddr;
int callmgr_sock;
- char ttydev[TTYMAX];
+ char ttydev[PATH_MAX];
int pty_fd, tty_fd, rc;
pid_t parent_pid, child_pid;
u_int16_t call_id, peer_call_id;
@@ -289,13 +294,23 @@
void launch_pppd(char *ttydev, int argc, char **argv) {
char *new_argv[argc+4]; /* XXX if not using GCC, hard code a limit here. */
int i;
+ int newi = 0;
- new_argv[0] = PPPD_BINARY;
- new_argv[1] = ttydev;
- new_argv[2] = "38400";
+ new_argv[newi++] = PPPD_BINARY;
+#ifdef USER_PPP
+ new_argv[newi++] = "-direct";
+ if ((i = open(ttydev, O_RDWR)) == -1)
+ fatal("Cannot open %s: %s", ttydev, strerror(errno));
+ if (dup2(i, 0) == -1)
+ fatal("dup2 failed: %s", strerror(errno));
+ close(i);
+#else
+ new_argv[newi++] = ttydev;
+ new_argv[newi++] = "38400";
+#endif
for (i=0; i<argc; i++)
- new_argv[i+3] = argv[i];
- new_argv[i+3] = NULL;
+ new_argv[newi++] = argv[i];
+ new_argv[newi] = NULL;
execvp(new_argv[0], new_argv);
}
|
