Commit b8acc1b9 authored by bol-van's avatar bol-van
Browse files

Revert "Revert "Revert "nfqws,tpws: fflush stdin,stdout""" 

This reverts commit 123eb057.
parent 123eb057

nfq/nfqws.c

+4 −6
Original line number Diff line number Diff line
@@ -294,7 +294,6 @@ static int nfq_main(void) 
	fd = nfq_fd(h);

	do

	{

		fflush(stdout); fflush(stderr);

		while ((rd = recv(fd, buf, sizeof(buf), 0)) >= 0)

		{

			ReloadCheck();
@@ -305,7 +304,6 @@ static int nfq_main(void) 
			}

			else

				DLOG("recv from nfq returned 0 !\n");

			fflush(stdout);	fflush(stderr);

		}

		e=errno;

		DLOG_ERR("recv: recv=%zd errno %d\n",rd,e);
@@ -391,8 +389,6 @@ static int dvt_main(void) 


	for(;;)

	{

		fflush(stdout);	fflush(stderr);



		FD_ZERO(&fdset);

		for(i=0;i<fdct;i++) FD_SET(fd[i], &fdset);

		r = select(fdmax,&fdset,NULL,NULL,NULL);
@@ -513,7 +509,8 @@ static int win_main(const char *windivert_filter) 
		DLOG_CONDUP("windivert initialized. capture is started.\n");



		// cygwin auto flush fails when piping

		fflush(stdout);	fflush(stderr);

		fflush(stdout);

		fflush(stderr);



		for (id=0;;id++)

		{
@@ -579,7 +576,8 @@ static int win_main(const char *windivert_filter) 
			}

	

			// cygwin auto flush fails when piping

			fflush(stdout);	fflush(stderr);

			fflush(stdout);

			fflush(stderr);

		}

	}

	win_dark_deinit();

tpws/tpws_conn.c

+2 −2
Original line number Diff line number Diff line
@@ -1548,8 +1548,6 @@ int event_loop(const int *listen_fd, size_t listen_fd_ct) 


		DBGPRINT("epoll_wait\n");



		fflush(stdout); fflush(stderr);



		if ((num_events = epoll_wait(efd, events, MAX_EPOLL_EVENTS, -1)) == -1)

		{

			if (errno == EINTR) continue; // system call was interrupted
@@ -1757,6 +1755,8 @@ int event_loop(const int *listen_fd, size_t listen_fd_ct) 
			// at least one leg was removed. recount legs

			print_legs();

		}



		fflush(stderr); fflush(stdout); // for console messages

	}



ex: