/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to plugins.d/mandos-client.c

  • Committer: Teddy Hogeborn
  • Date: 2012-06-16 22:38:54 UTC
  • mto: (301.1.1 release) (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 302.
  • Revision ID: teddy@recompile.se-20120616223854-mfxkg6fgqr56sma5
* plugins.d/mandos-client (mandos_context): Removed "simple_poll"
                                            member.
  (simple_poll): New global variable.  All users changed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
161
161
  const char *priority;
162
162
  gpgme_ctx_t ctx;
163
163
  server *current_server;
164
 
  char *interfaces;
165
 
  size_t interfaces_size;
166
164
} mandos_context;
167
165
 
168
166
/* global so signal handler can reach it*/
169
167
AvahiSimplePoll *simple_poll;
 
168
mandos_context mc = { .server = NULL, .dh_bits = 1024,
 
169
                      .priority = "SECURE256:!CTYPE-X.509:"
 
170
                      "+CTYPE-OPENPGP", .current_server = NULL };
170
171
 
171
172
sig_atomic_t quit_now = 0;
172
173
int signal_received = 0;
209
210
 
210
211
/* Add server to set of servers to retry periodically */
211
212
bool add_server(const char *ip, in_port_t port, AvahiIfIndex if_index,
212
 
                int af, server **current_server){
 
213
                int af){
213
214
  int ret;
214
215
  server *new_server = malloc(sizeof(server));
215
216
  if(new_server == NULL){
225
226
    return false;
226
227
  }
227
228
  /* Special case of first server */
228
 
  if(*current_server == NULL){
 
229
  if (mc.current_server == NULL){
229
230
    new_server->next = new_server;
230
231
    new_server->prev = new_server;
231
 
    *current_server = new_server;
 
232
    mc.current_server = new_server;
232
233
  /* Place the new server last in the list */
233
234
  } else {
234
 
    new_server->next = *current_server;
235
 
    new_server->prev = (*current_server)->prev;
 
235
    new_server->next = mc.current_server;
 
236
    new_server->prev = mc.current_server->prev;
236
237
    new_server->prev->next = new_server;
237
 
    (*current_server)->prev = new_server;
 
238
    mc.current_server->prev = new_server;
238
239
  }
239
 
  ret = clock_gettime(CLOCK_MONOTONIC, &(*current_server)->last_seen);
 
240
  ret = clock_gettime(CLOCK_MONOTONIC, &mc.current_server->last_seen);
240
241
  if(ret == -1){
241
242
    perror_plus("clock_gettime");
242
243
    return false;
248
249
 * Initialize GPGME.
249
250
 */
250
251
static bool init_gpgme(const char *seckey, const char *pubkey,
251
 
                       const char *tempdir, mandos_context *mc){
 
252
                       const char *tempdir){
252
253
  gpgme_error_t rc;
253
254
  gpgme_engine_info_t engine_info;
254
255
  
273
274
      return false;
274
275
    }
275
276
    
276
 
    rc = gpgme_op_import(mc->ctx, pgp_data);
 
277
    rc = gpgme_op_import(mc.ctx, pgp_data);
277
278
    if(rc != GPG_ERR_NO_ERROR){
278
279
      fprintf_plus(stderr, "bad gpgme_op_import: %s: %s\n",
279
280
                   gpgme_strsource(rc), gpgme_strerror(rc));
323
324
  }
324
325
  
325
326
  /* Create new GPGME "context" */
326
 
  rc = gpgme_new(&(mc->ctx));
 
327
  rc = gpgme_new(&(mc.ctx));
327
328
  if(rc != GPG_ERR_NO_ERROR){
328
329
    fprintf_plus(stderr, "Mandos plugin mandos-client: "
329
330
                 "bad gpgme_new: %s: %s\n", gpgme_strsource(rc),
344
345
 */
345
346
static ssize_t pgp_packet_decrypt(const char *cryptotext,
346
347
                                  size_t crypto_size,
347
 
                                  char **plaintext,
348
 
                                  mandos_context *mc){
 
348
                                  char **plaintext){
349
349
  gpgme_data_t dh_crypto, dh_plain;
350
350
  gpgme_error_t rc;
351
351
  ssize_t ret;
377
377
  
378
378
  /* Decrypt data from the cryptotext data buffer to the plaintext
379
379
     data buffer */
380
 
  rc = gpgme_op_decrypt(mc->ctx, dh_crypto, dh_plain);
 
380
  rc = gpgme_op_decrypt(mc.ctx, dh_crypto, dh_plain);
381
381
  if(rc != GPG_ERR_NO_ERROR){
382
382
    fprintf_plus(stderr, "bad gpgme_op_decrypt: %s: %s\n",
383
383
                 gpgme_strsource(rc), gpgme_strerror(rc));
384
384
    plaintext_length = -1;
385
385
    if(debug){
386
386
      gpgme_decrypt_result_t result;
387
 
      result = gpgme_op_decrypt_result(mc->ctx);
 
387
      result = gpgme_op_decrypt_result(mc.ctx);
388
388
      if(result == NULL){
389
389
        fprintf_plus(stderr, "gpgme_op_decrypt_result failed\n");
390
390
      } else {
481
481
}
482
482
 
483
483
static int init_gnutls_global(const char *pubkeyfilename,
484
 
                              const char *seckeyfilename,
485
 
                              mandos_context *mc){
 
484
                              const char *seckeyfilename){
486
485
  int ret;
487
486
  
488
487
  if(debug){
505
504
  }
506
505
  
507
506
  /* OpenPGP credentials */
508
 
  ret = gnutls_certificate_allocate_credentials(&mc->cred);
 
507
  ret = gnutls_certificate_allocate_credentials(&mc.cred);
509
508
  if(ret != GNUTLS_E_SUCCESS){
510
509
    fprintf_plus(stderr, "GnuTLS memory error: %s\n",
511
510
                 safer_gnutls_strerror(ret));
521
520
  }
522
521
  
523
522
  ret = gnutls_certificate_set_openpgp_key_file
524
 
    (mc->cred, pubkeyfilename, seckeyfilename,
 
523
    (mc.cred, pubkeyfilename, seckeyfilename,
525
524
     GNUTLS_OPENPGP_FMT_BASE64);
526
525
  if(ret != GNUTLS_E_SUCCESS){
527
526
    fprintf_plus(stderr,
533
532
  }
534
533
  
535
534
  /* GnuTLS server initialization */
536
 
  ret = gnutls_dh_params_init(&mc->dh_params);
 
535
  ret = gnutls_dh_params_init(&mc.dh_params);
537
536
  if(ret != GNUTLS_E_SUCCESS){
538
537
    fprintf_plus(stderr, "Error in GnuTLS DH parameter"
539
538
                 " initialization: %s\n",
540
539
                 safer_gnutls_strerror(ret));
541
540
    goto globalfail;
542
541
  }
543
 
  ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits);
 
542
  ret = gnutls_dh_params_generate2(mc.dh_params, mc.dh_bits);
544
543
  if(ret != GNUTLS_E_SUCCESS){
545
544
    fprintf_plus(stderr, "Error in GnuTLS prime generation: %s\n",
546
545
                 safer_gnutls_strerror(ret));
547
546
    goto globalfail;
548
547
  }
549
548
  
550
 
  gnutls_certificate_set_dh_params(mc->cred, mc->dh_params);
 
549
  gnutls_certificate_set_dh_params(mc.cred, mc.dh_params);
551
550
  
552
551
  return 0;
553
552
  
554
553
 globalfail:
555
554
  
556
 
  gnutls_certificate_free_credentials(mc->cred);
 
555
  gnutls_certificate_free_credentials(mc.cred);
557
556
  gnutls_global_deinit();
558
 
  gnutls_dh_params_deinit(mc->dh_params);
 
557
  gnutls_dh_params_deinit(mc.dh_params);
559
558
  return -1;
560
559
}
561
560
 
562
 
static int init_gnutls_session(gnutls_session_t *session,
563
 
                               mandos_context *mc){
 
561
static int init_gnutls_session(gnutls_session_t *session){
564
562
  int ret;
565
563
  /* GnuTLS session creation */
566
564
  do {
578
576
  {
579
577
    const char *err;
580
578
    do {
581
 
      ret = gnutls_priority_set_direct(*session, mc->priority, &err);
 
579
      ret = gnutls_priority_set_direct(*session, mc.priority, &err);
582
580
      if(quit_now){
583
581
        gnutls_deinit(*session);
584
582
        return -1;
595
593
  
596
594
  do {
597
595
    ret = gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE,
598
 
                                 mc->cred);
 
596
                                 mc.cred);
599
597
    if(quit_now){
600
598
      gnutls_deinit(*session);
601
599
      return -1;
611
609
  /* ignore client certificate if any. */
612
610
  gnutls_certificate_server_set_request(*session, GNUTLS_CERT_IGNORE);
613
611
  
614
 
  gnutls_dh_set_prime_bits(*session, mc->dh_bits);
 
612
  gnutls_dh_set_prime_bits(*session, mc.dh_bits);
615
613
  
616
614
  return 0;
617
615
}
623
621
/* Called when a Mandos server is found */
624
622
static int start_mandos_communication(const char *ip, in_port_t port,
625
623
                                      AvahiIfIndex if_index,
626
 
                                      int af, mandos_context *mc){
 
624
                                      int af){
627
625
  int ret, tcp_sd = -1;
628
626
  ssize_t sret;
629
627
  union {
659
657
    return -1;
660
658
  }
661
659
  
662
 
  if(if_index != AVAHI_IF_UNSPEC and mc->interfaces != NULL){
663
 
    /* Check if the interface is one of the interfaces we are using */
664
 
    bool match = false;
665
 
    {
666
 
      char *interface = NULL;
667
 
      while((interface=argz_next(mc->interfaces, mc->interfaces_size,
668
 
                                 interface))){
669
 
        if(if_nametoindex(interface) == (unsigned int)if_index){
670
 
          match = true;
671
 
          break;
672
 
        }
673
 
      }
674
 
    }
675
 
    if(not match){
676
 
      if(debug){
677
 
        char interface[IF_NAMESIZE];
678
 
        if(if_indextoname((unsigned int)if_index, interface) == NULL){
679
 
          perror_plus("if_indextoname");
680
 
        } else {
681
 
          fprintf_plus(stderr, "Skipping server on non-used interface"
682
 
                       " \"%s\"\n",
683
 
                       if_indextoname((unsigned int)if_index,
684
 
                                      interface));
685
 
        }
686
 
      }
687
 
      return -1;
688
 
    }
689
 
  }
690
 
  
691
 
  ret = init_gnutls_session(&session, mc);
 
660
  ret = init_gnutls_session(&session);
692
661
  if(ret != 0){
693
662
    return -1;
694
663
  }
966
935
  if(buffer_length > 0){
967
936
    ssize_t decrypted_buffer_size;
968
937
    decrypted_buffer_size = pgp_packet_decrypt(buffer, buffer_length,
969
 
                                               &decrypted_buffer, mc);
 
938
                                               &decrypted_buffer);
970
939
    if(decrypted_buffer_size >= 0){
971
940
      
972
941
      written = 0;
1033
1002
                             AVAHI_GCC_UNUSED AvahiStringList *txt,
1034
1003
                             AVAHI_GCC_UNUSED AvahiLookupResultFlags
1035
1004
                             flags,
1036
 
                             void* mc){
 
1005
                             AVAHI_GCC_UNUSED void* userdata){
1037
1006
  if(r == NULL){
1038
1007
    return;
1039
1008
  }
1051
1020
    fprintf_plus(stderr, "(Avahi Resolver) Failed to resolve service "
1052
1021
                 "'%s' of type '%s' in domain '%s': %s\n", name, type,
1053
1022
                 domain,
1054
 
                 avahi_strerror(avahi_server_errno
1055
 
                                (((mandos_context*)mc)->server)));
 
1023
                 avahi_strerror(avahi_server_errno(mc.server)));
1056
1024
    break;
1057
1025
    
1058
1026
  case AVAHI_RESOLVER_FOUND:
1066
1034
      }
1067
1035
      int ret = start_mandos_communication(ip, (in_port_t)port,
1068
1036
                                           interface,
1069
 
                                           avahi_proto_to_af(proto),
1070
 
                                           mc);
 
1037
                                           avahi_proto_to_af(proto));
1071
1038
      if(ret == 0){
1072
1039
        avahi_simple_poll_quit(simple_poll);
1073
1040
      } else {
1074
1041
        if(not add_server(ip, (in_port_t)port, interface,
1075
 
                          avahi_proto_to_af(proto),
1076
 
                          &((mandos_context*)mc)->current_server)){
 
1042
                          avahi_proto_to_af(proto))){
1077
1043
          fprintf_plus(stderr, "Failed to add server \"%s\" to server"
1078
1044
                       " list\n", name);
1079
1045
        }
1092
1058
                            const char *domain,
1093
1059
                            AVAHI_GCC_UNUSED AvahiLookupResultFlags
1094
1060
                            flags,
1095
 
                            void* mc){
 
1061
                            AVAHI_GCC_UNUSED void* userdata){
1096
1062
  if(b == NULL){
1097
1063
    return;
1098
1064
  }
1109
1075
  case AVAHI_BROWSER_FAILURE:
1110
1076
    
1111
1077
    fprintf_plus(stderr, "(Avahi browser) %s\n",
1112
 
                 avahi_strerror(avahi_server_errno
1113
 
                                (((mandos_context*)mc)->server)));
 
1078
                 avahi_strerror(avahi_server_errno(mc.server)));
1114
1079
    avahi_simple_poll_quit(simple_poll);
1115
1080
    return;
1116
1081
    
1120
1085
       the callback function is called the Avahi server will free the
1121
1086
       resolver for us. */
1122
1087
    
1123
 
    if(avahi_s_service_resolver_new(((mandos_context*)mc)->server,
1124
 
                                    interface, protocol, name, type,
1125
 
                                    domain, protocol, 0,
1126
 
                                    resolve_callback, mc) == NULL)
 
1088
    if(avahi_s_service_resolver_new(mc.server, interface, protocol,
 
1089
                                    name, type, domain, protocol, 0,
 
1090
                                    resolve_callback, NULL) == NULL)
1127
1091
      fprintf_plus(stderr, "Avahi: Failed to resolve service '%s':"
1128
1092
                   " %s\n", name,
1129
 
                   avahi_strerror(avahi_server_errno
1130
 
                                  (((mandos_context*)mc)->server)));
 
1093
                   avahi_strerror(avahi_server_errno(mc.server)));
1131
1094
    break;
1132
1095
    
1133
1096
  case AVAHI_BROWSER_REMOVE:
1353
1316
  return 1;
1354
1317
}
1355
1318
 
1356
 
int avahi_loop_with_timeout(AvahiSimplePoll *s, int retry_interval,
1357
 
                            mandos_context *mc){
 
1319
int avahi_loop_with_timeout(AvahiSimplePoll *s, int retry_interval){
1358
1320
  int ret;
1359
1321
  struct timespec now;
1360
1322
  struct timespec waited_time;
1361
1323
  intmax_t block_time;
1362
1324
  
1363
1325
  while(true){
1364
 
    if(mc->current_server == NULL){
 
1326
    if(mc.current_server == NULL){
1365
1327
      if (debug){
1366
1328
        fprintf_plus(stderr, "Wait until first server is found."
1367
1329
                     " No timeout!\n");
1381
1343
      /* Calculating in ms how long time between now and server
1382
1344
         who we visted longest time ago. Now - last seen.  */
1383
1345
      waited_time.tv_sec = (now.tv_sec
1384
 
                            - mc->current_server->last_seen.tv_sec);
 
1346
                            - mc.current_server->last_seen.tv_sec);
1385
1347
      waited_time.tv_nsec = (now.tv_nsec
1386
 
                             - mc->current_server->last_seen.tv_nsec);
 
1348
                             - mc.current_server->last_seen.tv_nsec);
1387
1349
      /* total time is 10s/10,000ms.
1388
1350
         Converting to s from ms by dividing by 1,000,
1389
1351
         and ns to ms by dividing by 1,000,000. */
1397
1359
      }
1398
1360
      
1399
1361
      if(block_time <= 0){
1400
 
        ret = start_mandos_communication(mc->current_server->ip,
1401
 
                                         mc->current_server->port,
1402
 
                                         mc->current_server->if_index,
1403
 
                                         mc->current_server->af, mc);
 
1362
        ret = start_mandos_communication(mc.current_server->ip,
 
1363
                                         mc.current_server->port,
 
1364
                                         mc.current_server->if_index,
 
1365
                                         mc.current_server->af);
1404
1366
        if(ret == 0){
1405
 
          avahi_simple_poll_quit(s);
 
1367
          avahi_simple_poll_quit(simple_poll);
1406
1368
          return 0;
1407
1369
        }
1408
1370
        ret = clock_gettime(CLOCK_MONOTONIC,
1409
 
                            &mc->current_server->last_seen);
 
1371
                            &mc.current_server->last_seen);
1410
1372
        if(ret == -1){
1411
1373
          perror_plus("clock_gettime");
1412
1374
          return -1;
1413
1375
        }
1414
 
        mc->current_server = mc->current_server->next;
 
1376
        mc.current_server = mc.current_server->next;
1415
1377
        block_time = 0;         /* Call avahi to find new Mandos
1416
1378
                                   servers, but don't block */
1417
1379
      }
1784
1746
}
1785
1747
 
1786
1748
int main(int argc, char *argv[]){
1787
 
  mandos_context mc = { .server = NULL, .dh_bits = 1024,
1788
 
                        .priority = "SECURE256:!CTYPE-X.509:"
1789
 
                        "+CTYPE-OPENPGP", .current_server = NULL, 
1790
 
                        .interfaces = NULL, .interfaces_size = 0 };
1791
1749
  AvahiSServiceBrowser *sb = NULL;
1792
1750
  error_t ret_errno;
1793
1751
  int ret;
1794
1752
  intmax_t tmpmax;
1795
1753
  char *tmp;
1796
1754
  int exitcode = EXIT_SUCCESS;
 
1755
  char *interfaces = NULL;
 
1756
  size_t interfaces_size = 0;
1797
1757
  char *interfaces_to_take_down = NULL;
1798
1758
  size_t interfaces_to_take_down_size = 0;
1799
1759
  char tempdir[] = "/tmp/mandosXXXXXX";
1899
1859
        connect_to = arg;
1900
1860
        break;
1901
1861
      case 'i':                 /* --interface */
1902
 
        ret_errno = argz_add_sep(&mc.interfaces, &mc.interfaces_size,
1903
 
                                 arg, (int)',');
 
1862
        ret_errno = argz_add_sep(&interfaces, &interfaces_size, arg,
 
1863
                                 (int)',');
1904
1864
        if(ret_errno != 0){
1905
1865
          argp_error(state, "%s", strerror(ret_errno));
1906
1866
        }
2033
1993
      }
2034
1994
    
2035
1995
      /* Lower privileges */
2036
 
      lower_privileges();
 
1996
      errno = 0;
 
1997
      ret = seteuid(uid);
 
1998
      if(ret == -1){
 
1999
        perror_plus("seteuid");
 
2000
      }
2037
2001
    }
2038
2002
  }
2039
2003
  
2040
 
  /* Remove invalid interface names (except "none") */
 
2004
  /* Remove empty interface names */
2041
2005
  {
2042
2006
    char *interface = NULL;
2043
 
    while((interface = argz_next(mc.interfaces, mc.interfaces_size,
 
2007
    while((interface = argz_next(interfaces, interfaces_size,
2044
2008
                                 interface))){
2045
 
      if(strcmp(interface, "none") != 0
2046
 
         and if_nametoindex(interface) == 0){
2047
 
        if(interface[0] != '\0'){
 
2009
      if(if_nametoindex(interface) == 0){
 
2010
        if(interface[0] != '\0' and strcmp(interface, "none") != 0){
2048
2011
          fprintf_plus(stderr, "Not using nonexisting interface"
2049
2012
                       " \"%s\"\n", interface);
2050
2013
        }
2051
 
        argz_delete(&mc.interfaces, &mc.interfaces_size, interface);
 
2014
        argz_delete(&interfaces, &interfaces_size, interface);
2052
2015
        interface = NULL;
2053
2016
      }
2054
2017
    }
2056
2019
  
2057
2020
  /* Run network hooks */
2058
2021
  {
2059
 
    if(mc.interfaces != NULL){
2060
 
      interfaces_hooks = malloc(mc.interfaces_size);
 
2022
    
 
2023
    if(interfaces != NULL){
 
2024
      interfaces_hooks = malloc(interfaces_size);
2061
2025
      if(interfaces_hooks == NULL){
2062
2026
        perror_plus("malloc");
2063
2027
        goto end;
2064
2028
      }
2065
 
      memcpy(interfaces_hooks, mc.interfaces, mc.interfaces_size);
2066
 
      interfaces_hooks_size = mc.interfaces_size;
 
2029
      memcpy(interfaces_hooks, interfaces, interfaces_size);
 
2030
      interfaces_hooks_size = interfaces_size;
2067
2031
      argz_stringify(interfaces_hooks, interfaces_hooks_size,
2068
2032
                     (int)',');
2069
2033
    }
2153
2117
  }
2154
2118
  
2155
2119
  /* If no interfaces were specified, make a list */
2156
 
  if(mc.interfaces == NULL){
 
2120
  if(interfaces == NULL){
2157
2121
    struct dirent **direntries;
2158
2122
    /* Look for any good interfaces */
2159
2123
    ret = scandir(sys_class_net, &direntries, good_interface,
2161
2125
    if(ret >= 1){
2162
2126
      /* Add all found interfaces to interfaces list */
2163
2127
      for(int i = 0; i < ret; ++i){
2164
 
        ret_errno = argz_add(&mc.interfaces, &mc.interfaces_size,
 
2128
        ret_errno = argz_add(&interfaces, &interfaces_size,
2165
2129
                             direntries[i]->d_name);
2166
2130
        if(ret_errno != 0){
2167
2131
          perror_plus("argz_add");
2181
2145
    }
2182
2146
  }
2183
2147
  
 
2148
  /* If we only got one interface, explicitly use only that one */
 
2149
  if(argz_count(interfaces, interfaces_size) == 1){
 
2150
    if(debug){
 
2151
      fprintf_plus(stderr, "Using only interface \"%s\"\n",
 
2152
                   interfaces);
 
2153
    }
 
2154
    if_index = (AvahiIfIndex)if_nametoindex(interfaces);
 
2155
  }
 
2156
  
2184
2157
  /* Bring up interfaces which are down */
2185
 
  {
 
2158
  if(not (argz_count(interfaces, interfaces_size) == 1
 
2159
          and strcmp(interfaces, "none") == 0)){
2186
2160
    char *interface = NULL;
2187
 
    while((interface = argz_next(mc.interfaces, mc.interfaces_size,
 
2161
    while((interface = argz_next(interfaces, interfaces_size,
2188
2162
                                 interface))){
2189
 
      /* If interface name is "none", stop bringing up interfaces.
2190
 
         Also remove all instances of "none" from the list */
2191
 
      if(strcmp(interface, "none") == 0){
2192
 
        argz_delete(&mc.interfaces, &mc.interfaces_size,
2193
 
                    interface);
2194
 
        interface = NULL;
2195
 
        while((interface = argz_next(mc.interfaces,
2196
 
                                     mc.interfaces_size, interface))){
2197
 
          if(strcmp(interface, "none") == 0){
2198
 
            argz_delete(&mc.interfaces, &mc.interfaces_size,
2199
 
                        interface);
2200
 
            interface = NULL;
2201
 
          }
2202
 
        }
2203
 
        break;
2204
 
      }
2205
2163
      bool interface_was_up = interface_is_up(interface);
2206
2164
      ret = bring_up_interface(interface, delay);
2207
2165
      if(not interface_was_up){
2215
2173
        }
2216
2174
      }
2217
2175
    }
 
2176
    free(interfaces);
 
2177
    interfaces = NULL;
 
2178
    interfaces_size = 0;
2218
2179
    if(debug and (interfaces_to_take_down == NULL)){
2219
2180
      fprintf_plus(stderr, "No interfaces were brought up\n");
2220
2181
    }
2221
2182
  }
2222
2183
  
2223
 
  /* If we only got one interface, explicitly use only that one */
2224
 
  if(argz_count(mc.interfaces, mc.interfaces_size) == 1){
2225
 
    if(debug){
2226
 
      fprintf_plus(stderr, "Using only interface \"%s\"\n",
2227
 
                   mc.interfaces);
2228
 
    }
2229
 
    if_index = (AvahiIfIndex)if_nametoindex(mc.interfaces);
2230
 
  }
2231
 
  
2232
2184
  if(quit_now){
2233
2185
    goto end;
2234
2186
  }
2235
2187
  
2236
 
  ret = init_gnutls_global(pubkey, seckey, &mc);
 
2188
  ret = init_gnutls_global(pubkey, seckey);
2237
2189
  if(ret == -1){
2238
2190
    fprintf_plus(stderr, "init_gnutls_global failed\n");
2239
2191
    exitcode = EX_UNAVAILABLE;
2256
2208
    goto end;
2257
2209
  }
2258
2210
  
2259
 
  if(not init_gpgme(pubkey, seckey, tempdir, &mc)){
 
2211
  if(not init_gpgme(pubkey, seckey, tempdir)){
2260
2212
    fprintf_plus(stderr, "init_gpgme failed\n");
2261
2213
    exitcode = EX_UNAVAILABLE;
2262
2214
    goto end;
2292
2244
      exitcode = EX_USAGE;
2293
2245
      goto end;
2294
2246
    }
2295
 
    
 
2247
  
2296
2248
    if(quit_now){
2297
2249
      goto end;
2298
2250
    }
2319
2271
    }
2320
2272
    
2321
2273
    while(not quit_now){
2322
 
      ret = start_mandos_communication(address, port, if_index, af,
2323
 
                                       &mc);
 
2274
      ret = start_mandos_communication(address, port, if_index, af);
2324
2275
      if(quit_now or ret == 0){
2325
2276
        break;
2326
2277
      }
2374
2325
  /* Create the Avahi service browser */
2375
2326
  sb = avahi_s_service_browser_new(mc.server, if_index,
2376
2327
                                   AVAHI_PROTO_UNSPEC, "_mandos._tcp",
2377
 
                                   NULL, 0, browse_callback,
2378
 
                                   (void *)&mc);
 
2328
                                   NULL, 0, browse_callback, NULL);
2379
2329
  if(sb == NULL){
2380
2330
    fprintf_plus(stderr, "Failed to create service browser: %s\n",
2381
2331
                 avahi_strerror(avahi_server_errno(mc.server)));
2394
2344
  }
2395
2345
 
2396
2346
  ret = avahi_loop_with_timeout(simple_poll,
2397
 
                                (int)(retry_interval * 1000), &mc);
 
2347
                                (int)(retry_interval * 1000));
2398
2348
  if(debug){
2399
2349
    fprintf_plus(stderr, "avahi_loop_with_timeout exited %s\n",
2400
2350
                 (ret == 0) ? "successfully" : "with error");
2407
2357
  }
2408
2358
  
2409
2359
  /* Cleanup things */
2410
 
  free(mc.interfaces);
2411
 
  
2412
2360
  if(sb != NULL)
2413
2361
    avahi_s_service_browser_free(sb);
2414
2362