mrpd: remove txnow code

4 files changed, 2 insertions, 86 deletions

diff --git a/daemons/mrpd/mrp.c b/daemons/mrpd/mrp.c
index 25f54f7b..90b2652c 100644
--- a/daemons/mrpd/mrp.c
+++ b/daemons/mrpd/mrp.c
@@ -770,26 +770,6 @@ int mrp_applicant_fsm(struct mrp_database *mrp_db, mrp_applicant_attribute_t * a
 	}
 
 	attrib->tx = tx;
-	/*
-	See note 6, table 10.3
-	*/
-#if MRP_USE_TXNOW
-	if ((attrib->mrp_state != mrp_state) && (event != MRP_EVENT_TX) && (event != MRP_EVENT_TXLA)) {
-		switch (mrp_state) {
-		case  MRP_VP_STATE:
-		case  MRP_VN_STATE:
-		case  MRP_AN_STATE:
-		case  MRP_AA_STATE:
-		case  MRP_LA_STATE:
-		case  MRP_AP_STATE:
-		case  MRP_LO_STATE:
-			mrp_schedule_tx_event(mrp_db);
-			break;
-		default:
-			break;
-		}
-	}
-#endif
 
 #if LOG_MVRP || LOG_MSRP || LOG_MMRP
 	if (attrib->mrp_state != mrp_state) {
diff --git a/daemons/mrpd/mrp.h b/daemons/mrpd/mrp.h
index 5e589db6..ce01d029 100644
--- a/daemons/mrpd/mrp.h
+++ b/daemons/mrpd/mrp.h
@@ -44,8 +44,7 @@
 #define MRP_DEFAULT_POINT_TO_POINT_MAC	1    /* operPointToPointMAC */
 #define MRP_ENCODE_YES		0	/* must send */
 #define MRP_ENCODE_OPTIONAL	1	/* send if smaller */
-#define MRP_USE_TXNOW		0	/* use TXNOW (join timer shortcut) */
-
+  
 typedef struct mrp_applicant_attribute {
 	int mrp_state;
 	int tx;			/* tx=1 means transmit on next TX event */
diff --git a/daemons/mrpd/mrpd.c b/daemons/mrpd/mrpd.c
index 4da23115..a74dd30c 100644
--- a/daemons/mrpd/mrpd.c
+++ b/daemons/mrpd/mrpd.c
@@ -107,19 +107,11 @@ extern SOCKET msrp_socket;
 int periodic_timer;
 int gc_timer;
 unsigned int gc_ctl_msg_count = 0;
-int txnowevt_fd = -1;
 
 extern struct mmrp_database *MMRP_db;
 extern struct mvrp_database *MVRP_db;
 extern struct msrp_database *MSRP_db;
 
-void mrp_schedule_tx_event(struct mrp_database *mrp_db)
-{
-	uint64_t one = 1;
-	write(txnowevt_fd, &one, sizeof(one));
-	mrp_db->schedule_tx_flag = 1;
-}
-
 int mrpd_timer_create(void)
 {
 	int t = timerfd_create(CLOCK_MONOTONIC, 0);
@@ -647,11 +639,6 @@ void process_events(void)
 	if (gc_timer > max_fd)
 		max_fd = gc_timer;
 
-	txnowevt_fd = eventfd(0, 0);
-	FD_SET(txnowevt_fd, &fds);
-	if (txnowevt_fd > max_fd)
-		max_fd = txnowevt_fd;
-
 	do {
 
 		sel_fds = fds;
@@ -743,34 +730,6 @@ void process_events(void)
 			if (FD_ISSET(gc_timer, &sel_fds)) {
 				mrpd_reclaim();
 			}
-			if (FD_ISSET(txnowevt_fd, &sel_fds)) {
-				uint64_t count;
-				read(txnowevt_fd, &count, sizeof(count));
-				if (mmrp_enable
-				    && MMRP_db->mrp_db.schedule_tx_flag) {
-					MMRP_db->mrp_db.schedule_tx_flag = 0;
-#if LOG_TXNOW
-					mrpd_log_printf("MMRP txnow event\n");
-#endif
-					mmrp_event(MRP_EVENT_TX, NULL);
-				}
-				if (mvrp_enable
-				    && MVRP_db->mrp_db.schedule_tx_flag) {
-					MVRP_db->mrp_db.schedule_tx_flag = 0;
-#if LOG_TXNOW
-					mrpd_log_printf("MVRP txnow event\n");
-#endif
-					mvrp_event(MRP_EVENT_TX, NULL);
-				}
-				if (msrp_enable
-				    && MSRP_db->mrp_db.schedule_tx_flag) {
-					MSRP_db->mrp_db.schedule_tx_flag = 0;
-#if LOG_TXNOW
-					mrpd_log_printf("MSRP txnow event\n");
-#endif
-					msrp_event(MRP_EVENT_TX, NULL);
-				}
-			}
 		}
 	} while (1);
 }
diff --git a/daemons/mrpd/mrpw.c b/daemons/mrpd/mrpw.c
index 87d37cb1..69e16ebd 100644
--- a/daemons/mrpd/mrpw.c
+++ b/daemons/mrpd/mrpw.c
@@ -84,7 +84,6 @@ enum {
 	pkt_event_wpcap_timeout,
 	pkt_event_localhost_timeout,
 	app_event_kill_all,
-	tx_request_event,
 	loop_time_tick
 };
 
@@ -95,7 +94,7 @@ int mvrp_enable;
 int msrp_enable;
 int logging_enable;
 int mrpd_port;
-HANDLE pkt_events[7];
+HANDLE pkt_events[6];
 HANDLE sem_kill_wpcap_thread;
 HANDLE sem_kill_localhost_thread;
 struct que_def *que_wpcap;
@@ -727,13 +726,6 @@ int mrpd_reclaim()
 
 }
 
-void mrp_schedule_tx_event(struct mrp_database *mrp_db)
-{
-	mrp_db->schedule_tx_flag = 1;
-	if (!SetEvent(pkt_events[tx_request_event]))
-		printf("SetEvent tx_request_event failed (%d)\n",
-		       GetLastError());
-}
 
 HANDLE kill_packet_capture;
 
@@ -807,20 +799,6 @@ void process_events(void)
 			break;
 
 		switch (dwEvent) {
-		case WAIT_OBJECT_0 + tx_request_event:
-			if (MMRP_db->mrp_db.schedule_tx_flag) {
-				MMRP_db->mrp_db.schedule_tx_flag = 0;
-				mmrp_event(MRP_EVENT_TX, NULL);
-			}
-			if (MVRP_db->mrp_db.schedule_tx_flag) {
-				MVRP_db->mrp_db.schedule_tx_flag = 0;
-				mvrp_event(MRP_EVENT_TX, NULL);
-			}
-			if (MSRP_db->mrp_db.schedule_tx_flag) {
-				MSRP_db->mrp_db.schedule_tx_flag = 0;
-				msrp_event(MRP_EVENT_TX, NULL);
-			}
-			break;
 		case WAIT_TIMEOUT:
 		case WAIT_OBJECT_0 + loop_time_tick:
 			/* timeout - run protocols */