Commit a09e2338 authored by Matteo Quintiliani's avatar Matteo Quintiliani

Minor change: renamed NMXP_MSGBODY_* to NMXP_*


git-svn-id: file:///home/quintiliani/svncopy/nmxptool/trunk@878 3cd66e75-5955-46cb-a940-c26e5fc5497d
parent fd46bd53
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Istituto Nazionale di Geofisica e Vulcanologia - Italy * Istituto Nazionale di Geofisica e Vulcanologia - Italy
* quintiliani@ingv.it * quintiliani@ingv.it
* *
* $Id: nmxp_chan.h,v 1.22 2007-11-24 21:39:54 mtheo Exp $ * $Id: nmxp_chan.h,v 1.23 2008-03-05 10:21:12 mtheo Exp $
* *
*/ */
...@@ -87,20 +87,20 @@ typedef struct { ...@@ -87,20 +87,20 @@ typedef struct {
int32_t instr_id; int32_t instr_id;
NMXP_DATATYPE datatype; NMXP_DATATYPE datatype;
int32_t type_of_channel; int32_t type_of_channel;
} NMXP_MSGBODY_PRECISLISTREQUEST; } NMXP_PRECISLISTREQUEST;
/*! \brief Channel info request body */ /*! \brief Channel info request body */
typedef struct { typedef struct {
int32_t key; int32_t key;
char name[12]; char name[12];
char network[12]; char network[12];
} NMXP_MSGBODY_CHANNELINFORESPONSE; } NMXP_CHANNELINFORESPONSE;
/*! \brief Channel info request body */ /*! \brief Channel info request body */
typedef struct { typedef struct {
int32_t key; int32_t key;
int32_t ignored; int32_t ignored;
} NMXP_MSGBODY_CHANNELINFOREQUEST; } NMXP_CHANNELINFOREQUEST;
/*! \brief Character separator for channel list */ /*! \brief Character separator for channel list */
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Istituto Nazionale di Geofisica e Vulcanologia - Italy * Istituto Nazionale di Geofisica e Vulcanologia - Italy
* quintiliani@ingv.it * quintiliani@ingv.it
* *
* $Id: nmxp.c,v 1.70 2008-03-03 13:20:09 mtheo Exp $ * $Id: nmxp.c,v 1.71 2008-03-05 10:21:12 mtheo Exp $
* *
*/ */
...@@ -423,9 +423,9 @@ NMXP_META_CHAN_LIST *nmxp_getMetaChannelList(char * hostname, int portnum, NMXP_ ...@@ -423,9 +423,9 @@ NMXP_META_CHAN_LIST *nmxp_getMetaChannelList(char * hostname, int portnum, NMXP_
NMXP_MSG_SERVER type; NMXP_MSG_SERVER type;
void *buffer = NULL; void *buffer = NULL;
int32_t length; int32_t length;
NMXP_MSGBODY_PRECISLISTREQUEST precisListRequestBody; NMXP_PRECISLISTREQUEST precisListRequestBody;
NMXP_MSGBODY_CHANNELINFOREQUEST channelInfoRequestBody; NMXP_CHANNELINFOREQUEST channelInfoRequestBody;
NMXP_MSGBODY_CHANNELINFORESPONSE *channelInfo; NMXP_CHANNELINFORESPONSE *channelInfo;
char str_start[200], str_end[200]; char str_start[200], str_end[200];
str_start[0] = 0; str_start[0] = 0;
...@@ -487,7 +487,7 @@ NMXP_META_CHAN_LIST *nmxp_getMetaChannelList(char * hostname, int portnum, NMXP_ ...@@ -487,7 +487,7 @@ NMXP_META_CHAN_LIST *nmxp_getMetaChannelList(char * hostname, int portnum, NMXP_
precisListRequestBody.instr_id = htonl(-1); precisListRequestBody.instr_id = htonl(-1);
precisListRequestBody.datatype = htonl(NMXP_DATA_TIMESERIES); precisListRequestBody.datatype = htonl(NMXP_DATA_TIMESERIES);
precisListRequestBody.type_of_channel = htonl(-1); precisListRequestBody.type_of_channel = htonl(-1);
nmxp_sendMessage(naqssock, NMXP_MSG_PRECISLISTREQUEST, &precisListRequestBody, sizeof(NMXP_MSGBODY_PRECISLISTREQUEST)); nmxp_sendMessage(naqssock, NMXP_MSG_PRECISLISTREQUEST, &precisListRequestBody, sizeof(NMXP_PRECISLISTREQUEST));
/* DAP Step 6: Receive Data until receiving a Ready message */ /* DAP Step 6: Receive Data until receiving a Ready message */
...@@ -533,7 +533,7 @@ NMXP_META_CHAN_LIST *nmxp_getMetaChannelList(char * hostname, int portnum, NMXP_ ...@@ -533,7 +533,7 @@ NMXP_META_CHAN_LIST *nmxp_getMetaChannelList(char * hostname, int portnum, NMXP_
/* DAP Step 5: Send Data Request */ /* DAP Step 5: Send Data Request */
channelInfoRequestBody.key = htonl(iter->key); channelInfoRequestBody.key = htonl(iter->key);
channelInfoRequestBody.ignored = htonl(0); channelInfoRequestBody.ignored = htonl(0);
nmxp_sendMessage(naqssock, NMXP_MSG_CHANNELINFOREQUEST, &channelInfoRequestBody, sizeof(NMXP_MSGBODY_CHANNELINFOREQUEST)); nmxp_sendMessage(naqssock, NMXP_MSG_CHANNELINFOREQUEST, &channelInfoRequestBody, sizeof(NMXP_CHANNELINFOREQUEST));
/* DAP Step 6: Receive Data until receiving a Ready message */ /* 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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment