From b6806395adf616f7b227472456e3f3398d75e9ee Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Mon, 25 Jan 2021 17:19:32 +0100
Subject: [PATCH] bip bip I am coding

---
 src/meas_lat.c |  2 +-
 src/tor_echo.c | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/meas_lat.c b/src/meas_lat.c
index b30ecca..2672ef4 100644
--- a/src/meas_lat.c
+++ b/src/meas_lat.c
@@ -560,6 +560,6 @@ int main(int argc, char** argv) {
 
   return 0;
 usage:
-  fprintf(stderr, "Usage: %s [-h <host>] [-p <port>] [-l] [-r] [-t <udp|tor>] [-c <count>] [-i <ms>] [-s <bytes>]\n", argv[0]);
+  fprintf(stderr, "Usage: %s [-h <host>] [-p <port>] [-l] [-r] [-t <udp|tcp|tor>] [-c <count>] [-i <ms>] [-s <bytes>]\n", argv[0]);
   exit(EXIT_FAILURE);
 }
diff --git a/src/tor_echo.c b/src/tor_echo.c
index a466955..aa445ac 100644
--- a/src/tor_echo.c
+++ b/src/tor_echo.c
@@ -94,8 +94,7 @@ int main(int argc, char** argv) {
 
   int tcp_serv_sock = 0, err, opt;
   struct evt_core_ctx evts = {0};
-  uint16_t ports[] = {7500};
-  int ports_count = sizeof(ports[0]) / sizeof(ports);
+  uint16_t port = 7500;
   struct tor_os_str tos;
   struct tor_ctl tctl;
   enum TOR_ONION_FLAGS tof = TOR_ONION_FLAG_NONE;
@@ -103,11 +102,14 @@ int main(int argc, char** argv) {
   struct torecho_ctx tctx = {0};
   tctx.mp.payload_size = 1500;
 
-  while ((opt = getopt(argc, argv, "ns:mt")) != -1) {
+  while ((opt = getopt(argc, argv, "ns:mtp:")) != -1) {
       switch(opt) {
       case 't':
         tctx.is_tor = 1;
         break;
+      case 'p':
+        port = atoi(optarg);
+        break;
       case 'n':
         tof |= TOR_ONION_FLAG_NON_ANONYMOUS;
         break;
@@ -151,12 +153,12 @@ int main(int argc, char** argv) {
 
   if (tctx.is_tor) {
     // 2. Create or load onion services
-    te_create_onion_services (&tos, &tctl, ports, ports_count, tof);
+    te_create_onion_services (&tos, &tctl, &port, 1, tof);
     printf("--- Onion services created\n");
   }
 
   // 3. Create TCP server
-  sprintf(url, "%d", ports[0]);
+  sprintf(url, "%d", port);
   tcp_serv_sock = create_tcp_server ("0.0.0.0", url);
   err = listen(tcp_serv_sock, SOMAXCONN);
 
@@ -166,7 +168,7 @@ int main(int argc, char** argv) {
   fdinfo.url = url;
 
   fdinfo.fd = tcp_serv_sock;
-  sprintf(url, "tcp:co:127.0.0.1:%d", ports[0]);
+  sprintf(url, "tcp:co:127.0.0.1:%d", port);
   fdinfo.cat->name = "tcp-co";
   evt_core_add_fd(&evts, &fdinfo);
   printf("--- TCP server is listening\n");