1 files changed, 33 insertions, 9 deletions

diff --git a/receiver.cpp b/receiver.cpp
index 4d599da..4a0269a 100644
--- a/receiver.cpp
+++ b/receiver.cpp
@@ -262,23 +262,47 @@ static void import_sessions(const char *root_dir) {
     closedir(dirp);
 }
 
-int main(int args, char **argv) {
+int main(int argc, char **argv) {
     mbedtls_ctr_drbg_context ctr_drbg;
     mbedtls_entropy_context entropy;
     mbedtls_pk_context pk;
-    int ret = 0;
+    int ret = 0, clport = PORT;
+    char * privkey_file = 0;
+    char * me = argv[0];
+
+    char ch;
+    while ((ch = getopt(argc, argv, "p:k:")) != -1) {
+        switch (ch) {
+        case 'k':
+            privkey_file = optarg;
+            break;
+        case 'p':
+            clport = std::stoi(optarg);
+            break;
+        default:
+            errx(-1, "Syntax: %s [sessionlogdir] xx", me);
+            break;
+        }
+    }
+    argc -= optind;
+    argv += optind;
 
-    if (args != 2)
-        errx(-1, "Syntax: %s [sessionlogdir]", argv[0]);
-    chdir(argv[1]);
+    if (argc != 1)
+        errx(-1, "Syntax: %s [sessionlogdir]", me);
+    chdir(argv[0]);
 
     mbedtls_pk_init( &pk );
     mbedtls_entropy_init( &entropy );
     mbedtls_ctr_drbg_init( &ctr_drbg );
     mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, pp, sizeof(pp));
 
-    if ((ret = mbedtls_pk_parse_key(&pk, privkey, sizeof(privkey), NULL, 0) ) != 0 )
-        errx(-1, "Fatal: mbedtls_pk_parse_key returned -0x%04x\n", -ret );
+    if (privkey_file) {
+        if ((ret = mbedtls_pk_parse_keyfile(&pk, privkey_file, NULL) ) != 0 )
+            errx(-1, "Fatal: mbedtls_pk_parse_keyfile returned -0x%04x\n", -ret );
+    } else {
+        if ((ret = mbedtls_pk_parse_key(&pk, privkey, sizeof(privkey), NULL, 0) ) != 0 )
+            errx(-1, "Fatal: mbedtls_pk_parse_key returned -0x%04x\n", -ret );
+    }
 
     int sock = socket(AF_INET, SOCK_DGRAM, 0);
     if (sock < 0)
@@ -287,9 +311,9 @@ int main(int args, char **argv) {
     struct sockaddr_in servaddr, peer;
     servaddr.sin_family = AF_INET;
     servaddr.sin_addr.s_addr = INADDR_ANY;
-    servaddr.sin_port = htons(PORT);
+    servaddr.sin_port = htons(clport);
     if (bind(sock, (const struct sockaddr *)&servaddr, sizeof(servaddr)) < 0)
-        errx(-1, "Fatal: Can't bind to port %d\n", PORT);
+        errx(-1, "Fatal: Can't bind to port %d\n", clport);
 
     import_sessions(".");