Fixed bug in clientShutdown() (6a9a511e) · Commits · Matteo Quintiliani / nmxptool

src/nmxptool.c

+22 −12

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		* Istituto Nazionale di Geofisica e Vulcanologia - Italy
		* quintiliani@ingv.it
		*
		* $Id: nmxptool.c,v 1.128 2008-02-19 14:42:26 mtheo Exp $
		* $Id: nmxptool.c,v 1.129 2008-02-21 11:27:26 mtheo Exp $
		*
		*/

		@@ -968,6 +968,11 @@ static void save_channel_states(NMXP_CHAN_LIST_NET *chan_list, NMXPTOOL_CHAN_SEQ
		FILE *fstatefile = NULL;
		char statefilefilename[MAX_LEN_FILENAME] = "";

		if(chan_list == NULL \|\| chan_list_seq == NULL) {
		nmxp_log(NMXP_LOG_ERR, NMXP_LOG_D_ANY, "save_channel_states() channel lists are NULL!\n");
		return;
		}

		if(params.statefile) {
		strncpy(statefilefilename, params.statefile, MAX_LEN_FILENAME);
		strncat(statefilefilename, NMXP_STR_STATE_EXT, MAX_LEN_FILENAME);
		@@ -1107,6 +1112,11 @@ void load_channel_states(NMXP_CHAN_LIST_NET chan_list, NMXPTOOL_CHAN_SEQ chan_
		static void flushing_raw_data_stream() {
		int to_cur_chan;

		if(channelList_subset == NULL \|\| channelList_Seq == NULL) {
		nmxp_log(NMXP_LOG_ERR, NMXP_LOG_D_ANY, " flushing_raw_data_stream() channel lists are NULL.\n");
		return ;
		}

		/* Flush raw data stream for each channel */
		if(params.stc == -1) {
		to_cur_chan = 0;
		@@ -1149,7 +1159,6 @@ static void clientShutdown(int sig) {
		}
		#endif


		/* PDS Step 7: Send Terminate Subscription */
		nmxp_sendTerminateSubscription(naqssock, NMXP_SHUTDOWN_NORMAL, "Good Bye!");

		@@ -1157,13 +1166,13 @@ static void clientShutdown(int sig) {
		nmxp_closeSocket(naqssock);



		/* Free the complete channel list */
		if(channelList) {
		free(channelList);
		channelList = NULL;
		}

		if(channelList_subset && channelList_Seq) {
		int i_chan = 0;

		#ifdef HAVE_LIBMSEED
		@@ -1179,13 +1188,14 @@ static void clientShutdown(int sig) {
		for(i_chan = 0; i_chan < channelList_subset->number; i_chan++) {
		nmxp_raw_stream_free(&(channelList_Seq[i_chan].raw_stream_buffer));
		}
		}

		if(channelList_Seq) {
		free(channelList_Seq);
		}

		/* This has to be the last */
		if(channelList_subset == NULL) {
		if(channelList_subset) {
		free(channelList_subset);
		}