Attachment #318064 for bug #426398

Lines 174-180 int max_echo_wait = PPTP_TIMEOUT; Link Here

(-)pptp-1.7.2/pptp_ctrl.c.prototype (-2 / +2 lines)
174		174
175	/* Local prototypes */	175	/* Local prototypes */
176	static void pptp_reset_timer(void);	176	static void pptp_reset_timer(void);
177	static void pptp_handle_timer();	177	static void pptp_handle_timer(void);
178	/* Write/read as much as we can without blocking. */	178	/* Write/read as much as we can without blocking. */
179	int pptp_write_some(PPTP_CONN * conn);	179	int pptp_write_some(PPTP_CONN * conn);
180	int pptp_read_some(PPTP_CONN * conn);	180	int pptp_read_some(PPTP_CONN * conn);
Lines 1059-1065 static void pptp_reset_timer(void) Link Here
1059		1059
1060		1060
1061	/* Handle keep-alive timer ************************************************/	1061	/* Handle keep-alive timer ************************************************/
1062	static void pptp_handle_timer()	1062	static void pptp_handle_timer(void)
1063	{	1063	{
1064	int i;	1064	int i;
1065	/* "Keep Alives and Timers, 1": check connection state */	1065	/* "Keep Alives and Timers, 1": check connection state */

Lines 71-77 void print_packet(int fd, void *pack, un Link Here

(-)pptp-1.7.2/pptp_gre.c.prototype (-1 / +1 lines)
71	#endif	71	#endif
72		72
73	/* time_now_usecs *********************************************************/	73	/* time_now_usecs *********************************************************/
74	uint64_t time_now_usecs()	74	uint64_t time_now_usecs(void)
75	{	75	{
76	struct timeval tv;	76	struct timeval tv;
77	gettimeofday(&tv, NULL);	77	gettimeofday(&tv, NULL);

Lines 30-36 int set_quirk_index(int index) Link Here

(-)pptp-1.7.2/pptp_quirks.c.prototype (-1 / +1 lines)
30	return -1;	30	return -1;
31	}	31	}
32		32
33	int get_quirk_index()	33	int get_quirk_index(void)
34	{	34	{
35	return quirk_index;	35	return quirk_index;
36	}	36	}

Lines 53-59 int set_quirk_index(int index); Link Here

(-)pptp-1.7.2/pptp_quirks.h.prototype (-1 / +1 lines)
53		53
54	/* get the global quirk index. return the index on success,	54	/* get the global quirk index. return the index on success,
55	-1 if no quirk is defined */	55	-1 if no quirk is defined */
56	int get_quirk_index();	56	int get_quirk_index(void);
57		57
58		58
59	#endif /* INC_PPTP_QUIRKS_H */	59	#endif /* INC_PPTP_QUIRKS_H */

Lines 217-223 int pqueue_del (pqueue_t *point) { Link Here

(-)pptp-1.7.2/pqueue.c.prototype (-1 / +1 lines)
217		217
218		218
219		219
220	pqueue_t *pqueue_head () {	220	pqueue_t *pqueue_head (void) {
221	return pq_head;	221	return pq_head;
222	}	222	}
223		223

Lines 24-30 typedef struct pqueue { Link Here

(-)pptp-1.7.2/pqueue.h.prototype (-1 / +1 lines)
24		24
25	int pqueue_add (u_int32_t seq, unsigned char *packet, int packlen);	25	int pqueue_add (u_int32_t seq, unsigned char *packet, int packlen);
26	int pqueue_del (pqueue_t *point);	26	int pqueue_del (pqueue_t *point);
27	pqueue_t *pqueue_head ();	27	pqueue_t *pqueue_head (void);
28	int pqueue_expiry_time (pqueue_t *entry);	28	int pqueue_expiry_time (pqueue_t *entry);
29		29
30	#endif /* PQUEUE_H */	30	#endif /* PQUEUE_H */




  /* TODO: check for failure of command */
}

void routing_start(void) {
  char buf[256];
  snprintf(buf, 255, "/sbin/ip route replace %s", route);
  FILE *p = popen(buf, "r");
  pclose(p);
}

void routing_end(void) {
  char buf[256];
  snprintf(buf, 255, "/sbin/ip route delete %s", route);
  FILE *p = popen(buf, "r");

Lines 1-3 Link Here

(-)pptp-1.7.2/routing.h.prototype (-2 / +2 lines)
1	void routing_init(char *ip);	1	void routing_init(char *ip);
2	void routing_start();	2	void routing_start(void);
3	void routing_end();	3	void routing_end(void);

Lines 171-177 static ssize_t write_reordered(int fd, c Link Here

(-)pptp-1.7.2/test.c.prototype (-1 / +1 lines)
171	}	171	}
172	}	172	}
173		173
174	struct test_redirections *test_redirections()	174	struct test_redirections *test_redirections(void)
175	{	175	{
176	static struct test_redirections *my = NULL;	176	static struct test_redirections *my = NULL;
177		177

Lines 2-5 struct test_redirections { Link Here

(-)pptp-1.7.2/test.h.prototype (-1 / +1 lines)
2	ssize_t (write)(int fd, const void buf, size_t count);	2	ssize_t (write)(int fd, const void buf, size_t count);
3	};	3	};
4		4
5	struct test_redirections *test_redirections();	5	struct test_redirections *test_redirections(void);




static int sigpipe[2];

/* create a signal pipe, returns 0 for success, -1 with errno for failure */
int sigpipe_create(void)
{
  int rc;
  

}

/* return the signal pipe read file descriptor for select(2) */
int sigpipe_fd(void)
{
  return sigpipe[0];
}

/* read and return the pending signal from the pipe */
int sigpipe_read(void)
{
  int signum;
  read(sigpipe[0], &signum, sizeof(signum));
  return signum;
}

void sigpipe_close(void)
{
  close(sigpipe[0]);
  close(sigpipe[1]);




/* signal to pipe delivery implementation */

/* create a signal pipe, returns 0 for success, -1 with errno for failure */
int sigpipe_create(void);

/* generic handler for signals, writes signal number to pipe */
void sigpipe_handler(int signum);

void sigpipe_assign(int signum);

/* return the signal pipe read file descriptor for select(2) */
int sigpipe_fd(void);

/* read and return the pending signal from the pipe */
int sigpipe_read(void);

void sigpipe_close(void);

#endif /* INC_UTIL_H */

Lines 35-41 struct vector_struct { Link Here

(-)pptp-1.7.2/vector.c.prototype (-1 / +1 lines)
35	static struct vector_item binary_search(VECTOR v, int key);	35	static struct vector_item binary_search(VECTOR v, int key);
36		36
37	/* vector_create **********************************************************/	37	/* vector_create **********************************************************/
38	VECTOR *vector_create()	38	VECTOR *vector_create(void)
39	{	39	{
40	const int INITIAL_SIZE = 4;	40	const int INITIAL_SIZE = 4;
41		41

Lines 12-18 Link Here

(-)pptp-1.7.2/vector.h.prototype (-1 / +1 lines)
12		12
13	typedef struct vector_struct VECTOR;	13	typedef struct vector_struct VECTOR;
14		14
15	VECTOR *vector_create();	15	VECTOR *vector_create(void);
16	void vector_destroy(VECTOR *v);	16	void vector_destroy(VECTOR *v);
17		17
18	int vector_size(VECTOR *v);	18	int vector_size(VECTOR *v);

Return to bug 426398

Lines 87-93 int file2fd(const char *path, const char Link Here

(-)pptp-1.7.2/util.c.prototype (-4 / +4 lines)
87	static int sigpipe[2];	87	static int sigpipe[2];
88		88
89	/* create a signal pipe, returns 0 for success, -1 with errno for failure */	89	/* create a signal pipe, returns 0 for success, -1 with errno for failure */
90	int sigpipe_create()	90	int sigpipe_create(void)
91	{	91	{
92	int rc;	92	int rc;
93		93
Lines 133-152 void sigpipe_assign(int signum) Link Here
133	}	133	}
134		134
135	/* return the signal pipe read file descriptor for select(2) */	135	/* return the signal pipe read file descriptor for select(2) */
136	int sigpipe_fd()	136	int sigpipe_fd(void)
137	{	137	{
138	return sigpipe[0];	138	return sigpipe[0];
139	}	139	}
140		140
141	/* read and return the pending signal from the pipe */	141	/* read and return the pending signal from the pipe */
142	int sigpipe_read()	142	int sigpipe_read(void)
143	{	143	{
144	int signum;	144	int signum;
145	read(sigpipe[0], &signum, sizeof(signum));	145	read(sigpipe[0], &signum, sizeof(signum));
146	return signum;	146	return signum;
147	}	147	}
148		148
149	void sigpipe_close()	149	void sigpipe_close(void)
150	{	150	{
151	close(sigpipe[0]);	151	close(sigpipe[0]);
152	close(sigpipe[1]);	152	close(sigpipe[1]);

Lines 64-77 void routing_init(char *ip) { Link Here

(-)pptp-1.7.2/routing.c.prototype (-2 / +2 lines)
64	/* TODO: check for failure of command */	64	/* TODO: check for failure of command */
65	}	65	}
66		66
67	void routing_start() {	67	void routing_start(void) {
68	char buf[256];	68	char buf[256];
69	snprintf(buf, 255, "/sbin/ip route replace %s", route);	69	snprintf(buf, 255, "/sbin/ip route replace %s", route);
70	FILE *p = popen(buf, "r");	70	FILE *p = popen(buf, "r");
71	pclose(p);	71	pclose(p);
72	}	72	}
73		73
74	void routing_end() {	74	void routing_end(void) {
75	char buf[256];	75	char buf[256];
76	snprintf(buf, 255, "/sbin/ip route delete %s", route);	76	snprintf(buf, 255, "/sbin/ip route delete %s", route);
77	FILE *p = popen(buf, "r");	77	FILE *p = popen(buf, "r");

Lines 35-41 int file2fd(const char *path, const char Link Here

(-)pptp-1.7.2/util.h.prototype (-4 / +4 lines)
35	/* signal to pipe delivery implementation */	35	/* signal to pipe delivery implementation */
36		36
37	/* create a signal pipe, returns 0 for success, -1 with errno for failure */	37	/* create a signal pipe, returns 0 for success, -1 with errno for failure */
38	int sigpipe_create();	38	int sigpipe_create(void);
39		39
40	/* generic handler for signals, writes signal number to pipe */	40	/* generic handler for signals, writes signal number to pipe */
41	void sigpipe_handler(int signum);	41	void sigpipe_handler(int signum);
Lines 44-54 void sigpipe_handler(int signum); Link Here
44	void sigpipe_assign(int signum);	44	void sigpipe_assign(int signum);
45		45
46	/* return the signal pipe read file descriptor for select(2) */	46	/* return the signal pipe read file descriptor for select(2) */
47	int sigpipe_fd();	47	int sigpipe_fd(void);
48		48
49	/* read and return the pending signal from the pipe */	49	/* read and return the pending signal from the pipe */
50	int sigpipe_read();	50	int sigpipe_read(void);
51		51
52	void sigpipe_close();	52	void sigpipe_close(void);
53		53
54	#endif /* INC_UTIL_H */	54	#endif /* INC_UTIL_H */