/mandos/trunk

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

« back to all changes in this revision

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

  • Committer: Teddy Hogeborn
  • Date: 2009-02-12 06:09:24 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090212060924-vwxgitxnwr14w9e4
* mandos (Client.start_checker): Bug fix: Add extra check in case the
                                 checker process completed quickly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
36
36
#define _GNU_SOURCE             /* TEMP_FAILURE_RETRY(), asprintf() */
37
37
 
38
38
#include <stdio.h>              /* fprintf(), stderr, fwrite(),
39
 
                                   stdout, ferror(), remove() */
 
39
                                   stdout, ferror(), sscanf(),
 
40
                                   remove() */
40
41
#include <stdint.h>             /* uint16_t, uint32_t */
41
42
#include <stddef.h>             /* NULL, size_t, ssize_t */
42
43
#include <stdlib.h>             /* free(), EXIT_SUCCESS, EXIT_FAILURE,
43
 
                                   srand(), strtof() */
 
44
                                   srand() */
44
45
#include <stdbool.h>            /* bool, false, true */
45
46
#include <string.h>             /* memset(), strcmp(), strlen(),
46
47
                                   strerror(), asprintf(), strcpy() */
55
56
#include <fcntl.h>              /* open() */
56
57
#include <dirent.h>             /* opendir(), struct dirent, readdir()
57
58
                                 */
58
 
#include <inttypes.h>           /* PRIu16, PRIdMAX, intmax_t,
59
 
                                   strtoimax() */
 
59
#include <inttypes.h>           /* PRIu16, intmax_t, SCNdMAX */
60
60
#include <assert.h>             /* assert() */
61
61
#include <errno.h>              /* perror(), errno */
62
62
#include <time.h>               /* nanosleep(), time() */
854
854
       the callback function is called the Avahi server will free the
855
855
       resolver for us. */
856
856
    
857
 
    if(avahi_s_service_resolver_new(mc.server, interface, protocol,
858
 
                                    name, type, domain, protocol, 0,
859
 
                                    resolve_callback, NULL) == NULL)
 
857
    if(!(avahi_s_service_resolver_new(mc.server, interface,
 
858
                                       protocol, name, type, domain,
 
859
                                       AVAHI_PROTO_INET6, 0,
 
860
                                       resolve_callback, NULL)))
860
861
      fprintf(stderr, "Avahi: Failed to resolve service '%s': %s\n",
861
862
              name, avahi_strerror(avahi_server_errno(mc.server)));
862
863
    break;
893
894
  int error;
894
895
  int ret;
895
896
  intmax_t tmpmax;
896
 
  char *tmp;
 
897
  int numchars;
897
898
  int exitcode = EXIT_SUCCESS;
898
899
  const char *interface = "eth0";
899
900
  struct ifreq network;
907
908
  const char *seckey = PATHDIR "/" SECKEY;
908
909
  const char *pubkey = PATHDIR "/" PUBKEY;
909
910
  
 
911
  /* Initialize Mandos context */
 
912
  mc = (mandos_context){ .simple_poll = NULL, .server = NULL,
 
913
                         .dh_bits = 1024, .priority = "SECURE256"
 
914
                         ":!CTYPE-X.509:+CTYPE-OPENPGP" };
910
915
  bool gnutls_initialized = false;
911
916
  bool gpgme_initialized = false;
912
 
  float delay = 2.5f;
913
 
  
 
917
  double delay = 2.5;
 
918
 
914
919
  struct sigaction old_sigterm_action;
915
920
  struct sigaction sigterm_action = { .sa_handler = handle_sigterm };
916
921
  
970
975
        pubkey = arg;
971
976
        break;
972
977
      case 129:                 /* --dh-bits */
973
 
        errno = 0;
974
 
        tmpmax = strtoimax(arg, &tmp, 10);
975
 
        if(errno != 0 or tmp == arg or *tmp != '\0'
976
 
           or tmpmax != (typeof(mc.dh_bits))tmpmax){
 
978
        ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
 
979
        if(ret < 1 or tmpmax != (typeof(mc.dh_bits))tmpmax
 
980
           or arg[numchars] != '\0'){
977
981
          fprintf(stderr, "Bad number of DH bits\n");
978
982
          exit(EXIT_FAILURE);
979
983
        }
983
987
        mc.priority = arg;
984
988
        break;
985
989
      case 131:                 /* --delay */
986
 
        errno = 0;
987
 
        delay = strtof(arg, &tmp);
988
 
        if(errno != 0 or tmp == arg or *tmp != '\0'){
 
990
        ret = sscanf(arg, "%lf%n", &delay, &numchars);
 
991
        if(ret < 1 or arg[numchars] != '\0'){
989
992
          fprintf(stderr, "Bad delay\n");
990
993
          exit(EXIT_FAILURE);
991
994
        }
1197
1200
      goto end;
1198
1201
    }
1199
1202
    uint16_t port;
1200
 
    errno = 0;
1201
 
    tmpmax = strtoimax(address+1, &tmp, 10);
1202
 
    if(errno != 0 or tmp == address+1 or *tmp != '\0'
1203
 
       or tmpmax != (uint16_t)tmpmax){
 
1203
    ret = sscanf(address+1, "%" SCNdMAX "%n", &tmpmax, &numchars);
 
1204
    if(ret < 1 or tmpmax != (uint16_t)tmpmax
 
1205
       or address[numchars+1] != '\0'){
1204
1206
      fprintf(stderr, "Bad port number\n");
1205
1207
      exitcode = EXIT_FAILURE;
1206
1208
      goto end;
1252
1254
  
1253
1255
  /* Create the Avahi service browser */
1254
1256
  sb = avahi_s_service_browser_new(mc.server, if_index,
1255
 
                                   AVAHI_PROTO_UNSPEC, "_mandos._tcp",
 
1257
                                   AVAHI_PROTO_INET6, "_mandos._tcp",
1256
1258
                                   NULL, 0, browse_callback, NULL);
1257
1259
  if(sb == NULL){
1258
1260
    fprintf(stderr, "Failed to create service browser: %s\n",