Skip to content
Snippets Groups Projects
Commit dc4c6575 authored by Armin Luntzer's avatar Armin Luntzer
Browse files

* allocate extra byte for string NUL terminator

* make compilers happy
parent 499c2eb2
No related branches found
No related tags found
No related merge requests found
...@@ -89,7 +89,7 @@ static struct sockaddr_in sockaddr_from_url(const char *url) ...@@ -89,7 +89,7 @@ static struct sockaddr_in sockaddr_from_url(const char *url)
struct sockaddr_in sockaddr; struct sockaddr_in sockaddr;
str = (char *) malloc(strlen(url)); str = (char *) malloc(strlen(url) + 1);
if (!str) { if (!str) {
perror("malloc"); perror("malloc");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
...@@ -241,8 +241,13 @@ static int usr_pkt_to_gresb(int fd, struct bridge_cfg *cfg) ...@@ -241,8 +241,13 @@ static int usr_pkt_to_gresb(int fd, struct bridge_cfg *cfg)
recv_bytes = recv(fd, recv_buffer, GRESB_PKT_SIZE_MAX, 0); recv_bytes = recv(fd, recv_buffer, GRESB_PKT_SIZE_MAX, 0);
for (int i = 0; i < recv_bytes; i++) #if 1
{
int i;
for (i = 0; i < recv_bytes; i++)
printf("%c", recv_buffer[i]); printf("%c", recv_buffer[i]);
}
#endif
/* we SEND to the TX port */ /* we SEND to the TX port */
ret = send_all(cfg->gresb_tx->socket, ret = send_all(cfg->gresb_tx->socket,
...@@ -309,6 +314,7 @@ static void *poll_socket(void *data) ...@@ -309,6 +314,7 @@ static void *poll_socket(void *data)
static int gresb_pkt_to_usr(int fd, struct bridge_cfg *cfg) static int gresb_pkt_to_usr(int fd, struct bridge_cfg *cfg)
{ {
int fdc;
int ret; int ret;
ssize_t recv_bytes; ssize_t recv_bytes;
uint8_t *recv_buffer; uint8_t *recv_buffer;
...@@ -320,10 +326,15 @@ static int gresb_pkt_to_usr(int fd, struct bridge_cfg *cfg) ...@@ -320,10 +326,15 @@ static int gresb_pkt_to_usr(int fd, struct bridge_cfg *cfg)
recv_bytes = recv(fd, recv_buffer, GRESB_PKT_SIZE_MAX, 0); recv_bytes = recv(fd, recv_buffer, GRESB_PKT_SIZE_MAX, 0);
for (int i = 0; i < recv_bytes; i++) #if 1
{
int i;
for (i = 0; i < recv_bytes; i++)
printf("%c", recv_buffer[i]); printf("%c", recv_buffer[i]);
}
#endif
for(int fdc = 0; fdc <= cfg->bridge->n_fd; fdc++) { for(fdc = 0; fdc <= cfg->bridge->n_fd; fdc++) {
if (!FD_ISSET(fdc, &cfg->bridge->set)) if (!FD_ISSET(fdc, &cfg->bridge->set))
continue; continue;
...@@ -528,7 +539,7 @@ int main(int argc, char **argv) ...@@ -528,7 +539,7 @@ int main(int argc, char **argv)
printf(" -G ADDRESS address of the GRESP\n"); printf(" -G ADDRESS address of the GRESP\n");
printf(" -L LINK_ID link id to use on GRESP\n"); printf(" -L LINK_ID link id to use on GRESP\n");
printf(" -p PORT local port number (default %d)\n", port); printf(" -p PORT local port number (default %d)\n", port);
printf(" -s ADDRESS local source address (default: %s\n", url); printf(" -s ADDRESS local source address (default: %s)\n", url);
printf(" -r ADDRESS:PORT client mode: address and port of remote target\n"); printf(" -r ADDRESS:PORT client mode: address and port of remote target\n");
printf(" -h, --help print this help and exit\n"); printf(" -h, --help print this help and exit\n");
printf("\n"); printf("\n");
...@@ -683,4 +694,7 @@ int main(int argc, char **argv) ...@@ -683,4 +694,7 @@ int main(int argc, char **argv)
if (gresb_tx.socket) if (gresb_tx.socket)
close(gresb_tx.socket); close(gresb_tx.socket);
return 0;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment