Attachment #318068 for bug #426398





sigjmp_buf callmgr_env;

void callmgr_sighandler(int sig __attribute__ ((unused))) {
    /* TODO: according to signal(2), siglongjmp() is unsafe used here */
    siglongjmp (callmgr_env, 1);
}

void callmgr_do_nothing(int sig __attribute__ ((unused))) {
    /* do nothing signal handler */
}


 *****************************************************************************/

/*** Call Manager *************************************************************/
int callmgr_main(int argc, char **argv, char **envp __attribute__ ((unused)))
{
    struct in_addr inetaddr;
    int inet_sock, unix_sock;

}

/*** close_inetsock ***********************************************************/
void close_inetsock(int fd, struct in_addr inetaddr __attribute__ ((unused)))
{
    close(fd);
}




sigjmp_buf env;

/*** signal handler ***********************************************************/
void sighandler(int sig __attribute__ ((unused)))
{
    siglongjmp(env, 1);
}

/*** report statistics signal handler (SIGUSR1) *******************************/
void sigstats(int sig __attribute__ ((unused)))
{
    syslog(LOG_NOTICE, "GRE statistics:\n");
#define LOG(name,value) syslog(LOG_NOTICE, name "\n", stats .value)

}

/*** call the call manager main ***********************************************/
void launch_callmgr(struct in_addr inetaddr, char *phonenr, int argc __attribute__ ((unused)),
        char**argv,char**envp) 
{
      char *my_argv[3] = { argv[0], inet_ntoa(inetaddr), phonenr };

{
    char *new_argv[argc + 4];/* XXX if not using GCC, hard code a limit here. */
    char str_pppd[] = PPPD_BINARY;
    char str_direct[] __attribute__ ((unused)) = "-direct";
    char str_38400[] = "38400";
    int i = 0, j;
    new_argv[i++] = str_pppd;

Return to bug 426398

Lines 38-49 void close_unixsock(int fd, struct in_ad Link Here

(-)pptp-1.7.2/pptp_callmgr.c.unused (-4 / +4 lines)
38		38
39	sigjmp_buf callmgr_env;	39	sigjmp_buf callmgr_env;
40		40
41	void callmgr_sighandler(int sig) {	41	void callmgr_sighandler(int sig __attribute__ ((unused))) {
42	/* TODO: according to signal(2), siglongjmp() is unsafe used here */	42	/* TODO: according to signal(2), siglongjmp() is unsafe used here */
43	siglongjmp (callmgr_env, 1);	43	siglongjmp (callmgr_env, 1);
44	}	44	}
45		45
46	void callmgr_do_nothing(int sig) {	46	void callmgr_do_nothing(int sig __attribute__ ((unused))) {
47	/* do nothing signal handler */	47	/* do nothing signal handler */
48	}	48	}
49		49
Lines 104-110 void call_callback(PPTP_CONN *conn, PPTP Link Here
104	*****************************************************************************/	104	*****************************************************************************/
105		105
106	/* Call Manager ***********************************************************/	106	/* Call Manager ***********************************************************/
107	int callmgr_main(int argc, char argv, char envp)	107	int callmgr_main(int argc, char argv, char envp __attribute__ ((unused)))
108	{	108	{
109	struct in_addr inetaddr;	109	struct in_addr inetaddr;
110	int inet_sock, unix_sock;	110	int inet_sock, unix_sock;
Lines 377-383 int open_unixsock(struct in_addr inetadd Link Here
377	}	377	}
378		378
379	/* close_inetsock *********************************************************/	379	/* close_inetsock *********************************************************/
380	void close_inetsock(int fd, struct in_addr inetaddr)	380	void close_inetsock(int fd, struct in_addr inetaddr __attribute__ ((unused)))
381	{	381	{
382	close(fd);	382	close(fd);
383	}	383	}

Lines 151-163 void do_nothing(int sig) Link Here

(-)pptp-1.7.2/pptp.c.unused (-4 / +4 lines)
151	sigjmp_buf env;	151	sigjmp_buf env;
152		152
153	/* signal handler *********************************************************/	153	/* signal handler *********************************************************/
154	void sighandler(int sig)	154	void sighandler(int sig __attribute__ ((unused)))
155	{	155	{
156	siglongjmp(env, 1);	156	siglongjmp(env, 1);
157	}	157	}
158		158
159	/* report statistics signal handler (SIGUSR1) *****************************/	159	/* report statistics signal handler (SIGUSR1) *****************************/
160	void sigstats(int sig)	160	void sigstats(int sig __attribute__ ((unused)))
161	{	161	{
162	syslog(LOG_NOTICE, "GRE statistics:\n");	162	syslog(LOG_NOTICE, "GRE statistics:\n");
163	#define LOG(name,value) syslog(LOG_NOTICE, name "\n", stats .value)	163	#define LOG(name,value) syslog(LOG_NOTICE, name "\n", stats .value)
Lines 508-514 int open_callmgr(struct in_addr inetaddr Link Here
508	}	508	}
509		509
510	/* call the call manager main *********************************************/	510	/* call the call manager main *********************************************/
511	void launch_callmgr(struct in_addr inetaddr, char *phonenr, int argc,	511	void launch_callmgr(struct in_addr inetaddr, char *phonenr, int argc __attribute__ ((unused)),
512	charargv,charenvp)	512	charargv,charenvp)
513	{	513	{
514	char *my_argv[3] = { argv[0], inet_ntoa(inetaddr), phonenr };	514	char *my_argv[3] = { argv[0], inet_ntoa(inetaddr), phonenr };
Lines 566-572 void launch_pppd(char *ttydev, int argc, Link Here
566	{	566	{
567	char new_argv[argc + 4];/ XXX if not using GCC, hard code a limit here. */	567	char new_argv[argc + 4];/ XXX if not using GCC, hard code a limit here. */
568	char str_pppd[] = PPPD_BINARY;	568	char str_pppd[] = PPPD_BINARY;
569	char str_direct[] = "-direct";	569	char str_direct[] __attribute__ ((unused)) = "-direct";
570	char str_38400[] = "38400";	570	char str_38400[] = "38400";
571	int i = 0, j;	571	int i = 0, j;
572	new_argv[i++] = str_pppd;	572	new_argv[i++] = str_pppd;