Skip to content
Snippets Groups Projects
Commit 472e18c2 authored by burneykb's avatar burneykb
Browse files

solved fe response issues

parent c9b061b3
No related branches found
No related tags found
No related merge requests found
Cli
\ No newline at end of file
Cli
\ No newline at end of file
Cli
\ No newline at end of file
Cli
\ No newline at end of file
Cli
\ No newline at end of file
Cli
\ No newline at end of file
Cli
\ No newline at end of file
...@@ -563,7 +563,6 @@ static int clientAddPendResponses(int fd, uint16_t packet_id) { ...@@ -563,7 +563,6 @@ static int clientAddPendResponses(int fd, uint16_t packet_id) {
static int clientRemovePendResponses(int fd, uint16_t packet_id) { static int clientRemovePendResponses(int fd, uint16_t packet_id) {
int *pendingResponses = get_client_pend_responses(fd); int *pendingResponses = get_client_pend_responses(fd);
for(int i = 0; i < CLIENT_MAX_PENDING_RESPONSES; i++) { for(int i = 0; i < CLIENT_MAX_PENDING_RESPONSES; i++) {
printf("might remove pendingResponses[%d], if it equals %d\n", i, packet_id);
if(pendingResponses[i] == packet_id) { if(pendingResponses[i] == packet_id) {
pendingResponses[i] = -1; pendingResponses[i] = -1;
return i; return i;
...@@ -737,22 +736,22 @@ static void client_recv(int fd) { ...@@ -737,22 +736,22 @@ static void client_recv(int fd) {
} }
/* Only add the client to the pending responses if it was a getparam command */ /* Only add the client to the pending responses if it was a getparam command */
// if (m.msg_type == GETPARAM_ID || m.msg_type == GETOUTPUT_ID || if (m.msg_type == GETPARAM_ID || m.msg_type == GETOUTPUT_ID ||
// m.msg_type == GETSOURCE_ID || m.msg_type == GETNODES_ID || m.msg_type == ADDNODE_ID) { m.msg_type == GETSOURCE_ID || m.msg_type == GETNODES_ID || m.msg_type == ADDNODE_ID) {
// printf("adding fd %d with id %d\n", fd, BytesTo16(packet[ID_L], packet[ID_H])); printf("adding fd %d with id %d\n", fd, BytesTo16(packet[ID_L], packet[ID_H]));
// if (clientAddPendResponses(fd, BytesTo16(packet[ID_L], packet[ID_H])) == -1) { if (clientAddPendResponses(fd, BytesTo16(packet[ID_L], packet[ID_H])) == -1) {
// warnx("Ran out of room! Consider increasing CLIENT_MAX_PENDING_RESPONSES!\n"); warnx("Ran out of room! Consider increasing CLIENT_MAX_PENDING_RESPONSES!\n");
// } }
// }
printf("packetToQuad = '");
for(int i = 0; i < (int)psize; ++i) {
printf(" %.2x ", packet[i]);
} }
printf("'\n");
// printf("packetToQuad = '");
// for(int i = 0; i < (int)psize; ++i) {
// printf(" %.2x ", packet[i]);
// }
// printf("'\n");
int retval = writeQuad(packet, psize); int retval = writeQuad(packet, psize);
printf("sent %d bytes\n", retval); // printf("sent %d bytes\n", retval);
free(data); free(data);
} }
...@@ -782,11 +781,11 @@ static void quad_recv() { ...@@ -782,11 +781,11 @@ static void quad_recv() {
} }
respBufLen += respLen; respBufLen += respLen;
printf("packetFromQuad = '"); // printf("packetFromQuad = '");
for(int i = 0; i < (int)respBufLen; ++i) { // for(int i = 0; i < (int)respBufLen; ++i) {
printf(" %.2x ", respBuf[i]); // printf(" %.2x ", respBuf[i]);
} // }
printf("'\n"); // printf("'\n");
while(respBufLen){ while(respBufLen){
datalen = DecodePacket(&m, data, CMD_MAX_LENGTH, respBuf, respBufLen); datalen = DecodePacket(&m, data, CMD_MAX_LENGTH, respBuf, respBufLen);
...@@ -833,11 +832,9 @@ static void quad_recv() { ...@@ -833,11 +832,9 @@ static void quad_recv() {
printf("New log file created: '%s'\n", log_file); printf("New log file created: '%s'\n", log_file);
quadlog_file = fopen(log_file, "a"); quadlog_file = fopen(log_file, "a");
quadlog_file_open = 1; quadlog_file_open = 1;
} }
/* something like this */
//printf("(Quad) : Log found\n"); //printf("(Quad) : Log found\n");
fwrite((char *) data, sizeof(char), m.data_len, quadlog_file); fwrite((char *) data, sizeof(char), m.data_len, quadlog_file);
// fflush(quadlog_file);
break; break;
case RESPPARAM_ID: case RESPPARAM_ID:
case RESPSOURCE_ID: case RESPSOURCE_ID:
...@@ -855,6 +852,7 @@ static void quad_recv() { ...@@ -855,6 +852,7 @@ static void quad_recv() {
break; break;
default: default:
printf("(Backend): message type %d ignored from quad\n", m.msg_type); printf("(Backend): message type %d ignored from quad\n", m.msg_type);
break;
} }
} }
} }
...@@ -882,6 +880,7 @@ static void handleResponse(struct metadata *m, uint8_t * data) ...@@ -882,6 +880,7 @@ static void handleResponse(struct metadata *m, uint8_t * data)
break; break;
default: default:
result = -1; result = -1;
break;
} }
if (result < 0) { if (result < 0) {
...@@ -890,12 +889,16 @@ static void handleResponse(struct metadata *m, uint8_t * data) ...@@ -890,12 +889,16 @@ static void handleResponse(struct metadata *m, uint8_t * data)
return; return;
} }
// for(int fd = 0; fd <= max_fd; ++fd) { printf("msg to client = '%s'\n", buffer);
// if (get_client_index(fd) < 0) {
// clientRemovePendResponses(fd, m->msg_id); for(int fd = 0; fd <= max_fd; ++fd) {
// write(fd, buffer, result); if (get_client_index(fd) > -1) {
// } clientRemovePendResponses(fd, m->msg_id);
// } write(fd, buffer, result);
}
}
printf("leaving handleResponse\n");
free(buffer); free(buffer);
} }
......
...@@ -120,7 +120,7 @@ int DecodeResponseParam( ...@@ -120,7 +120,7 @@ int DecodeResponseParam(
return -1; return -1;
} }
return snprintf(msg, max_len, "getparam %" PRId16 " %" PRId16 " %f", return snprintf(msg, max_len, "getparam %" PRId16 " %" PRId16 " %f\n",
BytesTo16(data[RESP_BLOCK_ID_L], data[RESP_BLOCK_ID_H]), BytesTo16(data[RESP_BLOCK_ID_L], data[RESP_BLOCK_ID_H]),
BytesTo16(data[RESP_PARAM_ID_L], data[RESP_PARAM_ID_H]), BytesTo16(data[RESP_PARAM_ID_L], data[RESP_PARAM_ID_H]),
BytesToFloat(data[RESP_VAL_1], data[RESP_VAL_2], BytesToFloat(data[RESP_VAL_1], data[RESP_VAL_2],
......
...@@ -30,7 +30,7 @@ int cli_getparam(struct backend_conn * conn, int argc, char ** argv) { ...@@ -30,7 +30,7 @@ int cli_getparam(struct backend_conn * conn, int argc, char ** argv) {
} }
printf("BLOCK.PARAM = VAL\n" \ printf("BLOCK.PARAM = VAL\n" \
" %" PRId16 ".%" PRId16 " = %lf\n", " %2" PRId16 ".%2" PRId16 " = %lf\n",
param_data.block, param_data.block,
param_data.param, param_data.param,
param_data.value); param_data.value);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment