Commit e5c8543e authored by Matteo Quintiliani's avatar Matteo Quintiliani
Browse files

Changed parameter for function nmxp_receiveMessage() 


git-svn-id: file:///home/quintiliani/svncopy/nmxptool/trunk@1263 3cd66e75-5955-46cb-a940-c26e5fc5497d
parent 0b1eb2cc

lib/nmxp.c

+94 −63
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 * 	Istituto Nazionale di Geofisica e Vulcanologia - Italy

 *	quintiliani@ingv.it

 *

 * $Id: nmxp.c,v 1.93 2009-08-17 08:19:46 mtheo Exp $

 * $Id: nmxp.c,v 1.94 2009-08-17 08:57:10 mtheo Exp $

 *

 */
@@ -46,22 +46,22 @@ int nmxp_receiveChannelList(int isock, NMXP_CHAN_LIST **pchannelList) { 
    int recv_errno;



    NMXP_MSG_SERVER type;

    void *buffer;

    char buffer[NMXP_MAX_LENGTH_DATA_BUFFER];

    int32_t length;



    *pchannelList = NULL;



    ret = nmxp_receiveMessage(isock, &type, &buffer, &length, 0, &recv_errno);

    ret = nmxp_receiveMessage(isock, &type, buffer, &length, 0, &recv_errno, NMXP_MAX_LENGTH_DATA_BUFFER);



    if(type != NMXP_MSG_CHANNELLIST) {

	nmxp_log(NMXP_LOG_ERR, NMXP_LOG_D_PACKETMAN, "Type %d is not NMXP_MSG_CHANNELLIST!\n", type);

	if(buffer) {

	    NMXP_MEM_FREE(buffer);

	    buffer = NULL;

	}

    } else {

	(*pchannelList) = (NMXP_CHAN_LIST *) NMXP_MEM_MALLOC(length);



	if( (*pchannelList) != NULL) {



	    memmove((*pchannelList), buffer, length);



	*pchannelList = buffer;

	    (*pchannelList)->number = ntohl((*pchannelList)->number);



	    nmxp_log(NMXP_LOG_NORM, NMXP_LOG_D_CHANNEL, "number of channels %d\n", (*pchannelList)->number);
@@ -74,6 +74,10 @@ int nmxp_receiveChannelList(int isock, NMXP_CHAN_LIST **pchannelList) { 
			(*pchannelList)->channel[i].key,

			NMXP_LOG_STR((*pchannelList)->channel[i].name));

	    }

	} else {

	    nmxp_log(NMXP_LOG_ERR, NMXP_LOG_D_PACKETMAN, "nmxp_receiveChannelList() Error allocating pchannelList!\n");

	    ret = NMXP_SOCKET_ERROR;

	}



    }
@@ -217,11 +221,11 @@ int nmxp_sendAddTimeSeriesChannel(int isock, NMXP_CHAN_LIST_NET *channelList, in 


NMXP_DATA_PROCESS *nmxp_receiveData(int isock, NMXP_CHAN_LIST_NET *channelList, const char *network_code, int timeoutsec, int *recv_errno ) {

    NMXP_MSG_SERVER type;

    void *buffer = NULL;

    char buffer[NMXP_MAX_LENGTH_DATA_BUFFER];

    int32_t length;

    NMXP_DATA_PROCESS *pd = NULL;



    if(nmxp_receiveMessage(isock, &type, &buffer, &length, timeoutsec, recv_errno) == NMXP_SOCKET_OK) {

    if(nmxp_receiveMessage(isock, &type, buffer, &length, timeoutsec, recv_errno, NMXP_MAX_LENGTH_DATA_BUFFER) == NMXP_SOCKET_OK) {

	if(type == NMXP_MSG_COMPRESSED) {

	    nmxp_log(NMXP_LOG_NORM, NMXP_LOG_D_PACKETMAN, "Type %d is NMXP_MSG_COMPRESSED!\n", type);

	    pd = nmxp_processCompressedData(buffer, length, channelList, network_code);
@@ -531,11 +535,11 @@ NMXP_META_CHAN_LIST *nmxp_getMetaChannelList(char * hostname, int portnum, NMXP_ 
    int recv_errno;

    

    NMXP_MSG_SERVER type;

    void *buffer = NULL;

    char buffer[NMXP_MAX_LENGTH_DATA_BUFFER];

    int32_t length;

    NMXP_PRECISLISTREQUEST precisListRequestBody;

    NMXP_CHANNELINFOREQUEST channelInfoRequestBody;

    NMXP_CHANNELINFORESPONSE *channelInfo;

    NMXP_CHANNELINFORESPONSE *channelInfo = NULL;



    char str_start[NMXP_DATA_MAX_SIZE_DATE], str_end[NMXP_DATA_MAX_SIZE_DATE];

    str_start[0] = 0;
@@ -565,17 +569,21 @@ NMXP_META_CHAN_LIST *nmxp_getMetaChannelList(char * hostname, int portnum, NMXP_ 
	return NULL;

    }









    /* DAP Step 5: Send Data Request */

    nmxp_sendHeader(naqssock, NMXP_MSG_CHANNELLISTREQUEST, 0);



    /* DAP Step 6: Receive Data until receiving a Ready message */

    ret_sock = nmxp_receiveMessage(naqssock, &type, &buffer, &length, 0, &recv_errno);

    ret_sock = nmxp_receiveMessage(naqssock, &type, buffer, &length, 0, &recv_errno, NMXP_MAX_LENGTH_DATA_BUFFER);

    nmxp_log(NMXP_LOG_NORM, NMXP_LOG_D_EXTRA, "ret_sock = %d, type = %d, length = %d\n", ret_sock, type, length);



    while(ret_sock == NMXP_SOCKET_OK   &&    type != NMXP_MSG_READY) {

	channelList = buffer;

	if(channelList) {

	    NMXP_MEM_FREE(channelList);

	    channelList = NULL;

	}

	channelList = (NMXP_CHAN_LIST *) NMXP_MEM_MALLOC(length);

	if(channelList) {

	    memmove(channelList, buffer, length);



	    channelList->number = ntohl(channelList->number);
@@ -585,9 +593,12 @@ NMXP_META_CHAN_LIST *nmxp_getMetaChannelList(char * hostname, int portnum, NMXP_ 
		    nmxp_meta_chan_add(&chan_list, channelList->channel[i].key, channelList->channel[i].name, 0, 0, NULL, NMXP_META_SORT_NAME);

		}

	    }

	} else {

	    nmxp_log(NMXP_LOG_ERR, NMXP_LOG_D_ANY, "nmxp_getMetaChannelList() Error allocating channelList.\n");

	}



	/* Receive Message */

	ret_sock = nmxp_receiveMessage(naqssock, &type, &buffer, &length, 0, &recv_errno);

	ret_sock = nmxp_receiveMessage(naqssock, &type, buffer, &length, 0, &recv_errno, NMXP_MAX_LENGTH_DATA_BUFFER);

	nmxp_log(NMXP_LOG_NORM, NMXP_LOG_D_EXTRA, "ret_sock = %d, type = %d, length = %d\n", ret_sock, type, length);

    }
@@ -601,11 +612,17 @@ NMXP_META_CHAN_LIST *nmxp_getMetaChannelList(char * hostname, int portnum, NMXP_ 




    /* DAP Step 6: Receive Data until receiving a Ready message */

    ret_sock = nmxp_receiveMessage(naqssock, &type, &buffer, &length, 0, &recv_errno);

    ret_sock = nmxp_receiveMessage(naqssock, &type, buffer, &length, 0, &recv_errno, NMXP_MAX_LENGTH_DATA_BUFFER);

    nmxp_log(NMXP_LOG_NORM, NMXP_LOG_D_EXTRA, "ret_sock = %d, type = %d, length = %d\n", ret_sock, type, length);



    while(ret_sock == NMXP_SOCKET_OK   &&    type != NMXP_MSG_READY) {

	precisChannelList = buffer;

	if(precisChannelList) {

	    NMXP_MEM_FREE(precisChannelList);

	    precisChannelList = NULL;

	}

	precisChannelList = (NMXP_CHAN_PRECISLIST *) NMXP_MEM_MALLOC(length);

	if(precisChannelList) {

	    memmove(precisChannelList, buffer, length);



	    precisChannelList->number = ntohl(precisChannelList->number);

	    for(i = 0; i < precisChannelList->number; i++) {
@@ -629,9 +646,12 @@ NMXP_META_CHAN_LIST *nmxp_getMetaChannelList(char * hostname, int portnum, NMXP_ 
		   NMXP_LOG_STR(str_start), NMXP_LOG_STR(str_end));

		   */

	    }

	} else {

	    nmxp_log(NMXP_LOG_ERR, NMXP_LOG_D_ANY, "nmxp_getMetaChannelList() Error allocating precisChannelList.\n");

	}



	/* Receive Message */

	ret_sock = nmxp_receiveMessage(naqssock, &type, &buffer, &length, 0, &recv_errno);

	ret_sock = nmxp_receiveMessage(naqssock, &type, buffer, &length, 0, &recv_errno, NMXP_MAX_LENGTH_DATA_BUFFER);

	nmxp_log(NMXP_LOG_NORM, NMXP_LOG_D_EXTRA, "ret_sock = %d, type = %d, length = %d\n", ret_sock, type, length);

    }
@@ -646,19 +666,30 @@ NMXP_META_CHAN_LIST *nmxp_getMetaChannelList(char * hostname, int portnum, NMXP_ 
		nmxp_sendMessage(naqssock, NMXP_MSG_CHANNELINFOREQUEST, &channelInfoRequestBody, sizeof(NMXP_CHANNELINFOREQUEST));



		/* DAP Step 6: Receive Data until receiving a Ready message */

		ret_sock = nmxp_receiveMessage(naqssock, &type, &buffer, &length, 0, &recv_errno);

		ret_sock = nmxp_receiveMessage(naqssock, &type, buffer, &length, 0, &recv_errno, NMXP_MAX_LENGTH_DATA_BUFFER);

		nmxp_log(NMXP_LOG_NORM, NMXP_LOG_D_EXTRA, "ret_sock = %d, type = %d, length = %d\n", ret_sock, type, length);



		while(ret_sock == NMXP_SOCKET_OK   &&    type != NMXP_MSG_READY) {

		    channelInfo = buffer;

		    if(channelInfo) {

			NMXP_MEM_FREE(channelInfo);

			channelInfo = NULL;

		    }

		    channelInfo = (NMXP_CHANNELINFORESPONSE *) NMXP_MEM_MALLOC(length);

		    if(channelInfo) {

			memmove(channelInfo, buffer, length);



			channelInfo->key = ntohl(channelInfo->key);



			if(!nmxp_meta_chan_set_network(chan_list, channelInfo->key, channelInfo->network)) {

			    nmxp_log(NMXP_LOG_ERR, NMXP_LOG_D_CHANNEL, "Key %d (%d) not found for %s!\n",

				    iter->key, channelInfo->key, NMXP_LOG_STR(iter->name));

			}

		    } else {

			nmxp_log(NMXP_LOG_ERR, NMXP_LOG_D_ANY, "nmxp_getMetaChannelList() Error allocating precisChannelList.\n");

		    }



		    /* Receive Message */

		    ret_sock = nmxp_receiveMessage(naqssock, &type, &buffer, &length, 0, &recv_errno);

		    ret_sock = nmxp_receiveMessage(naqssock, &type, buffer, &length, 0, &recv_errno, NMXP_MAX_LENGTH_DATA_BUFFER);

		    nmxp_log(NMXP_LOG_NORM, NMXP_LOG_D_EXTRA, "ret_sock = %d, type = %d, length = %d\n", ret_sock, type, length);

		}

	    }

src/nmxptool.c

+5 −5
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.216 2009-08-17 08:19:46 mtheo Exp $

 * $Id: nmxptool.c,v 1.217 2009-08-17 08:57:32 mtheo Exp $

 *

 */
@@ -146,7 +146,7 @@ int main (int argc, char **argv) { 
    char str_end_time[200] = "";



    NMXP_MSG_SERVER type;

    void *buffer = NULL;

    char buffer[NMXP_MAX_LENGTH_DATA_BUFFER];

    int32_t length;

    int ret;

    int main_ret = 0;
@@ -584,7 +584,7 @@ int main (int argc, char **argv) { 
		    }



		    /* DAP Step 6: Receive Data until receiving a Ready message */

		    ret = nmxp_receiveMessage(naqssock, &type, &buffer, &length, 0, &recv_errno);

		    ret = nmxp_receiveMessage(naqssock, &type, buffer, &length, 0, &recv_errno, NMXP_MAX_LENGTH_DATA_BUFFER);



		    nmxp_log(NMXP_LOG_NORM, NMXP_LOG_D_EXTRA, "ret = %d, type = %d, length = %d, recv_errno = %d\n",

			    ret, type, length, recv_errno);
@@ -653,7 +653,7 @@ int main (int argc, char **argv) { 


			if(params.flag_writefile  &&  outfile) {

			    /* Write buffer to the output file */

			    if(outfile && buffer && length > 0) {

			    if(outfile && length > 0) {

				int32_t length_int = length;

				nmxp_data_swap_4b((int32_t *) &length_int);

				fwrite(&length_int, sizeof(length_int), 1, outfile);
@@ -672,7 +672,7 @@ int main (int argc, char **argv) { 




			/* Receive Data */

			ret = nmxp_receiveMessage(naqssock, &type, &buffer, &length, 0, &recv_errno);

			ret = nmxp_receiveMessage(naqssock, &type, buffer, &length, 0, &recv_errno, NMXP_MAX_LENGTH_DATA_BUFFER);

			/* nmxp_log(NMXP_LOG_NORM, NMXP_LOG_D_CONNFLOW, "ret = %d, type = %d\n", ret, type); */

		    }