#include "utils.h"
// Symbols necessary to link with logger.o
-bool send_request(void *c, const char *msg, ...) { return false; }
-struct list_t *connection_list = NULL;
-bool send_meta(void *c, const char *msg , int len) { return false; }
+bool send_request(void *c, const char *msg, ...) {
+ return false;
+}
+void *mesh;
+void *global_log_cb;
+int global_log_level;
+bool send_meta(void *c, const char *msg, int len) {
+ return false;
+}
char *logfilename = NULL;
struct timeval now;
static int in = 0;
static int out = 1;
-static bool send_data(void *handle, uint8_t type, const char *data, size_t len) {
+static bool send_data(void *handle, uint8_t type, const void *data, size_t len) {
char hex[len * 2 + 1];
bin2hex(data, hex, len);
if(verbose)
return true;
}
-static bool receive_record(void *handle, uint8_t type, const char *data, uint16_t len) {
+static bool receive_record(void *handle, uint8_t type, const void *data, uint16_t len) {
if(verbose)
fprintf(stderr, "Received type %d record of %hu bytes:\n", type, len);
if(!writeonly)
static void usage() {
fprintf(stderr, "Usage: %s [options] my_ecdsa_key_file his_ecdsa_key_file [host] port\n\n", program_name);
fprintf(stderr, "Valid options are:\n"
- " -d, --datagram Enable datagram mode.\n"
- " -q, --quit Quit when EOF occurs on stdin.\n"
- " -r, --readonly Only send data from the socket to stdout.\n"
+ " -d, --datagram Enable datagram mode.\n"
+ " -q, --quit Quit when EOF occurs on stdin.\n"
+ " -r, --readonly Only send data from the socket to stdout.\n"
#ifdef HAVE_LINUX
- " -t, --tun Use a tun device instead of stdio.\n"
+ " -t, --tun Use a tun device instead of stdio.\n"
#endif
- " -w, --writeonly Only send data from stdin to the socket.\n"
- " -L, --packet-loss RATE Fake packet loss of RATE percent.\n"
- " -R, --replay-window N Set replay window to N bytes.\n"
- " -v, --verbose Display debug messages.\n"
- "\n");
+ " -w, --writeonly Only send data from stdin to the socket.\n"
+ " -L, --packet-loss RATE Fake packet loss of RATE percent.\n"
+ " -R, --replay-window N Set replay window to N bytes.\n"
+ " -v, --verbose Display debug messages.\n"
+ "\n");
fprintf(stderr, "Report bugs to bugs@meshlink.io.\n");
}
bool quit = false;
while((r = getopt_long(argc, argv, "dqrtwL:W:v", long_options, &option_index)) != EOF) {
- switch (r) {
- case 0: /* long option */
- break;
+ switch(r) {
+ case 0: /* long option */
+ break;
- case 'd': /* datagram mode */
- datagram = true;
- break;
+ case 'd': /* datagram mode */
+ datagram = true;
+ break;
- case 'q': /* close connection on EOF from stdin */
- quit = true;
- break;
+ case 'q': /* close connection on EOF from stdin */
+ quit = true;
+ break;
- case 'r': /* read only */
- readonly = true;
- break;
+ case 'r': /* read only */
+ readonly = true;
+ break;
- case 't': /* read only */
+ case 't': /* read only */
#ifdef HAVE_LINUX
- tun = true;
+ tun = true;
#else
- fprintf(stderr, "--tun is only supported on Linux.\n");
- usage();
- return 1;
+ fprintf(stderr, "--tun is only supported on Linux.\n");
+ usage();
+ return 1;
#endif
- break;
+ break;
- case 'w': /* write only */
- writeonly = true;
- break;
+ case 'w': /* write only */
+ writeonly = true;
+ break;
- case 'L': /* packet loss rate */
- packetloss = atoi(optarg);
- break;
+ case 'L': /* packet loss rate */
+ packetloss = atoi(optarg);
+ break;
- case 'W': /* replay window size */
- sptps_replaywin = atoi(optarg);
- break;
+ case 'W': /* replay window size */
+ sptps_replaywin = atoi(optarg);
+ break;
- case 'v': /* be verbose */
- verbose = true;
- break;
+ case 'v': /* be verbose */
+ verbose = true;
+ break;
- case '?': /* wrong options */
- usage();
- return 1;
+ case '?': /* wrong options */
+ usage();
+ return 1;
- case 1: /* help */
- usage();
- return 0;
+ case 1: /* help */
+ usage();
+ return 0;
- default:
- break;
+ default:
+ break;
}
}
#endif
struct addrinfo *ai, hint;
- memset(&hint, 0, sizeof hint);
+ memset(&hint, 0, sizeof(hint));
hint.ai_family = AF_UNSPEC;
hint.ai_socktype = datagram ? SOCK_DGRAM : SOCK_STREAM;
}
int one = 1;
- setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof one);
+ setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof(one));
if(initiator) {
if(connect(sock, ai->ai_addr, ai->ai_addrlen)) {
char buf[65536];
struct sockaddr addr;
- socklen_t addrlen = sizeof addr;
+ socklen_t addrlen = sizeof(addr);
- if(recvfrom(sock, buf, sizeof buf, MSG_PEEK, &addr, &addrlen) <= 0) {
+ if(recvfrom(sock, buf, sizeof(buf), MSG_PEEK, &addr, &addrlen) <= 0) {
fprintf(stderr, "Could not read from socket: %s\n", strerror(errno));
return 1;
}
return 1;
if(FD_ISSET(in, &fds)) {
- ssize_t len = read(in, buf, sizeof buf);
+ ssize_t len = read(in, buf, sizeof(buf));
if(len < 0) {
fprintf(stderr, "Could not read from stdin: %s\n", strerror(errno));
return 1;
sptps_force_kex(&s);
if(len > 1)
sptps_send_record(&s, 0, buf, len);
- } else
- if(!sptps_send_record(&s, buf[0] == '!' ? 1 : 0, buf, (len == 1 && buf[0] == '\n') ? 0 : buf[0] == '*' ? sizeof buf : len))
+ } else if(!sptps_send_record(&s, buf[0] == '!' ? 1 : 0, buf, (len == 1 && buf[0] == '\n') ? 0 : buf[0] == '*' ? sizeof(buf) : len))
return 1;
}
if(FD_ISSET(sock, &fds)) {
- ssize_t len = recv(sock, buf, sizeof buf, 0);
+ ssize_t len = recv(sock, buf, sizeof(buf), 0);
if(len < 0) {
fprintf(stderr, "Could not read from socket: %s\n", strerror(errno));
return 1;
projects / meshlink / blobdiff