bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1 | /*  -*- coding: utf-8 -*- */
 | 
| 2 | /*
 | |
| 261
by Teddy Hogeborn * plugins.d/askpass-fifo.c: Fix name in header. | 3 |  * Mandos-client - get and decrypt data from a Mandos server
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 4 |  *
 | 
| 5 |  * This program is partly derived from an example program for an Avahi
 | |
| 6 |  * service browser, downloaded from
 | |
| 7 |  * <http://avahi.org/browser/examples/core-browse-services.c>.  This
 | |
| 8 |  * includes the following functions: "resolve_callback",
 | |
| 9 |  * "browse_callback", and parts of "main".
 | |
| 10 |  * 
 | |
| 28
by Teddy Hogeborn * server.conf: New file. | 11 |  * Everything else is
 | 
| 807
by Teddy Hogeborn Update copyright year. | 12 |  * Copyright © 2008-2016 Teddy Hogeborn
 | 
| 13 |  * Copyright © 2008-2016 Björn Påhlsson
 | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 14 |  * 
 | 
| 15 |  * This program is free software: you can redistribute it and/or
 | |
| 16 |  * modify it under the terms of the GNU General Public License as
 | |
| 17 |  * published by the Free Software Foundation, either version 3 of the
 | |
| 18 |  * License, or (at your option) any later version.
 | |
| 19 |  * 
 | |
| 20 |  * This program is distributed in the hope that it will be useful, but
 | |
| 21 |  * WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
| 22 |  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
| 23 |  * General Public License for more details.
 | |
| 24 |  * 
 | |
| 25 |  * You should have received a copy of the GNU General Public License
 | |
| 26 |  * along with this program.  If not, see
 | |
| 27 |  * <http://www.gnu.org/licenses/>.
 | |
| 28 |  * 
 | |
| 505.1.2
by Teddy Hogeborn Change "fukt.bsnet.se" to "recompile.se" throughout. | 29 |  * Contact the authors at <mandos@recompile.se>.
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 30 |  */
 | 
| 31 | ||
| 28
by Teddy Hogeborn * server.conf: New file. | 32 | /* Needed by GPGME, specifically gpgme_data_seek() */
 | 
| 317
by Teddy Hogeborn Use "getconf" to get correct LFS compile and link flags. | 33 | #ifndef _LARGEFILE_SOURCE
 | 
| 13
by Björn Påhlsson Added following support: | 34 | #define _LARGEFILE_SOURCE
 | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 35 | #endif /* not _LARGEFILE_SOURCE */ | 
| 317
by Teddy Hogeborn Use "getconf" to get correct LFS compile and link flags. | 36 | #ifndef _FILE_OFFSET_BITS
 | 
| 13
by Björn Påhlsson Added following support: | 37 | #define _FILE_OFFSET_BITS 64
 | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 38 | #endif /* not _FILE_OFFSET_BITS */ | 
| 13
by Björn Påhlsson Added following support: | 39 | |
| 76
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Renamed | 40 | #define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), asprintf() */ | 
| 24.1.10
by Björn Påhlsson merge commit | 41 | |
| 76
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Renamed | 42 | #include <stdio.h> /* fprintf(), stderr, fwrite(), | 
| 694
by Teddy Hogeborn Make mandos-client use unlinkat() instead of remove(). | 43 | stdout, ferror() */ | 
| 588
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Eliminate | 44 | #include <stdint.h> /* uint16_t, uint32_t, intptr_t */ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 45 | #include <stddef.h> /* NULL, size_t, ssize_t */ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 46 | #include <stdlib.h> /* free(), EXIT_SUCCESS, srand(), | 
| 47 | strtof(), abort() */ | |
| 304
by Teddy Hogeborn Four new interrelated features: | 48 | #include <stdbool.h> /* bool, false, true */ | 
| 773
by Teddy Hogeborn mandos-client: Don't use memset(). | 49 | #include <string.h> /* strcmp(), strlen(), strerror(), | 
| 798
by Teddy Hogeborn plugins.d/mandos-client.c (get_flags): Use strncpy(), not strcpy(). | 50 | asprintf(), strncpy() */ | 
| 304
by Teddy Hogeborn Four new interrelated features: | 51 | #include <sys/ioctl.h> /* ioctl */ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 52 | #include <sys/types.h> /* socket(), inet_pton(), sockaddr, | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 53 | sockaddr_in6, PF_INET6, | 
| 304
by Teddy Hogeborn Four new interrelated features: | 54 | SOCK_STREAM, uid_t, gid_t, open(), | 
| 55 | opendir(), DIR */ | |
| 505.3.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Add error message. | 56 | #include <sys/stat.h> /* open(), S_ISREG */ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 57 | #include <sys/socket.h> /* socket(), struct sockaddr_in6, | 
| 667
by Teddy Hogeborn Use getnameinfo() instead of inet_ntop() in mandos-client. | 58 | inet_pton(), connect(), | 
| 59 | getnameinfo() */ | |
| 813
by Teddy Hogeborn Client: Remove new key directory introduced in GnuPG 2.1 | 60 | #include <fcntl.h> /* open(), unlinkat(), AT_REMOVEDIR */ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 61 | #include <dirent.h> /* opendir(), struct dirent, readdir() | 
| 62 | */ | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 63 | #include <inttypes.h> /* PRIu16, PRIdMAX, intmax_t, | 
| 64 | strtoimax() */ | |
| 813
by Teddy Hogeborn Client: Remove new key directory introduced in GnuPG 2.1 | 65 | #include <errno.h> /* perror(), errno, EINTR, EINVAL, | 
| 66 | EAI_SYSTEM, ENETUNREACH, | |
| 67 | EHOSTUNREACH, ECONNREFUSED, EPROTO, | |
| 68 | EIO, ENOENT, ENXIO, ENOMEM, EISDIR, | |
| 69 | ENOTEMPTY, | |
| 485
by Teddy Hogeborn Merge from Björn. | 70 | program_invocation_short_name */ | 
| 24.1.163
by Björn Påhlsson mandos-client: Added never ending loop for --connect | 71 | #include <time.h> /* nanosleep(), time(), sleep() */ | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 72 | #include <net/if.h> /* ioctl, ifreq, SIOCGIFFLAGS, IFF_UP, | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 73 | SIOCSIFFLAGS, if_indextoname(), | 
| 74 | if_nametoindex(), IF_NAMESIZE */ | |
| 304
by Teddy Hogeborn Four new interrelated features: | 75 | #include <netinet/in.h> /* IN6_IS_ADDR_LINKLOCAL, | 
| 76 | INET_ADDRSTRLEN, INET6_ADDRSTRLEN | |
| 77 | */ | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 78 | #include <unistd.h> /* close(), SEEK_SET, off_t, write(), | 
| 365
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Bug fix: Check result of setgid(). | 79 | getuid(), getgid(), seteuid(), | 
| 694
by Teddy Hogeborn Make mandos-client use unlinkat() instead of remove(). | 80 | setgid(), pause(), _exit(), | 
| 81 | unlinkat() */ | |
| 667
by Teddy Hogeborn Use getnameinfo() instead of inet_ntop() in mandos-client. | 82 | #include <arpa/inet.h> /* inet_pton(), htons() */ | 
| 304
by Teddy Hogeborn Four new interrelated features: | 83 | #include <iso646.h> /* not, or, and */ | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 84 | #include <argp.h> /* struct argp_option, error_t, struct | 
| 85 | argp_state, struct argp, | |
| 86 | argp_parse(), ARGP_KEY_ARG, | |
| 87 | ARGP_KEY_END, ARGP_ERR_UNKNOWN */ | |
| 307
by Teddy Hogeborn Merge from Björn: | 88 | #include <signal.h> /* sigemptyset(), sigaddset(), | 
| 354
by Teddy Hogeborn * plugins.d/mandos-client.c (signal_received): New. | 89 | sigaction(), SIGTERM, sig_atomic_t, | 
| 90 | raise() */ | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 91 | #include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_UNAVAILABLE, | 
| 92 | EX_NOHOST, EX_IOERR, EX_PROTOCOL */ | |
| 505.3.3
by teddy at bsnet * plugins.d/mandos-client.c: Prefix all printouts with "Mandos plugin | 93 | #include <sys/wait.h> /* waitpid(), WIFEXITED(), | 
| 94 | WEXITSTATUS(), WTERMSIG() */ | |
| 505.3.16
by teddy at bsnet * network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. | 95 | #include <grp.h> /* setgroups() */ | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 96 | #include <argz.h> /* argz_add_sep(), argz_next(), | 
| 97 | argz_delete(), argz_append(), | |
| 98 | argz_stringify(), argz_add(), | |
| 99 | argz_count() */ | |
| 667
by Teddy Hogeborn Use getnameinfo() instead of inet_ntop() in mandos-client. | 100 | #include <netdb.h> /* getnameinfo(), NI_NUMERICHOST, | 
| 101 | EAI_SYSTEM, gai_strerror() */ | |
| 307
by Teddy Hogeborn Merge from Björn: | 102 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 103 | #ifdef __linux__
 | 
| 24.1.124
by Björn Påhlsson Added lower kernel loglevel to reduce clutter on system console. | 104 | #include <sys/klog.h> /* klogctl() */ | 
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 105 | #endif /* __linux__ */ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 106 | |
| 107 | /* Avahi */
 | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 108 | /* All Avahi types, constants and functions
 | 
| 109 |  Avahi*, avahi_*,
 | |
| 110 |  AVAHI_* */
 | |
| 111 | #include <avahi-core/core.h> | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 112 | #include <avahi-core/lookup.h> | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 113 | #include <avahi-core/log.h> | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 114 | #include <avahi-common/simple-watch.h> | 
| 115 | #include <avahi-common/malloc.h> | |
| 116 | #include <avahi-common/error.h> | |
| 117 | ||
| 118 | /* GnuTLS */
 | |
| 76
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Renamed | 119 | #include <gnutls/gnutls.h> /* All GnuTLS types, constants and | 
| 120 | functions: | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 121 | gnutls_* | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 122 | init_gnutls_session(), | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 123 | GNUTLS_* */ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 124 | #include <gnutls/openpgp.h> | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 125 | /* gnutls_certificate_set_openpgp_key_file(), | 
| 126 | 			    GNUTLS_OPENPGP_FMT_BASE64 */
 | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 127 | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 128 | /* GPGME */
 | 
| 76
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Renamed | 129 | #include <gpgme.h> /* All GPGME types, constants and | 
| 130 | functions: | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 131 | gpgme_* | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 132 | GPGME_PROTOCOL_OpenPGP, | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 133 | GPG_ERR_NO_* */ | 
| 13
by Björn Påhlsson Added following support: | 134 | |
| 135 | #define BUFFER_SIZE 256
 | |
| 37
by Teddy Hogeborn Non-tested commit for merge purposes. | 136 | |
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 137 | #define PATHDIR "/conf/conf.d/mandos"
 | 
| 138 | #define SECKEY "seckey.txt"
 | |
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 139 | #define PUBKEY "pubkey.txt"
 | 
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 140 | #define HOOKDIR "/lib/mandos/network-hooks.d"
 | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 141 | |
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 142 | bool debug = false; | 
| 43
by Teddy Hogeborn * plugins.d/mandosclient.c: Cosmetic changes. | 143 | static const char mandos_protocol_version[] = "1"; | 
| 680
by Teddy Hogeborn Minor changes to minimize diff from last release. | 144 | const char *argp_program_version = "mandos-client " VERSION; | 
| 145 | const char *argp_program_bug_address = "<mandos@recompile.se>"; | |
| 237.2.33
by teddy at bsnet * plugins.d/mandos-client.c: An empty interface name now means to | 146 | static const char sys_class_net[] = "/sys/class/net"; | 
| 147 | char *connect_to = NULL; | |
| 505.3.4
by teddy at bsnet * plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the | 148 | const char *hookdir = HOOKDIR; | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 149 | int hookdir_fd = -1; | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 150 | uid_t uid = 65534; | 
| 151 | gid_t gid = 65534; | |
| 24.1.10
by Björn Påhlsson merge commit | 152 | |
| 485
by Teddy Hogeborn Merge from Björn. | 153 | /* Doubly linked list that need to be circularly linked when used */
 | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 154 | typedef struct server{ | 
| 155 | const char *ip; | |
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 156 | in_port_t port; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 157 | AvahiIfIndex if_index; | 
| 158 | int af; | |
| 159 | struct timespec last_seen; | |
| 160 | struct server *next; | |
| 161 | struct server *prev; | |
| 162 | } server; | |
| 163 | ||
| 42
by Teddy Hogeborn * plugins.d/mandosclient.c (start_mandos_communication): Change "to" | 164 | /* Used for passing in values through the Avahi callback functions */
 | 
| 13
by Björn Påhlsson Added following support: | 165 | typedef struct { | 
| 24.1.9
by Björn Påhlsson not working midwork... | 166 | AvahiServer *server; | 
| 13
by Björn Påhlsson Added following support: | 167 | gnutls_certificate_credentials_t cred; | 
| 24.1.9
by Björn Påhlsson not working midwork... | 168 | unsigned int dh_bits; | 
| 24.1.13
by Björn Påhlsson mandosclient | 169 | gnutls_dh_params_t dh_params; | 
| 24.1.9
by Björn Påhlsson not working midwork... | 170 | const char *priority; | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 171 | gpgme_ctx_t ctx; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 172 | server *current_server; | 
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 173 | char *interfaces; | 
| 174 | size_t interfaces_size; | |
| 24.1.9
by Björn Påhlsson not working midwork... | 175 | } mandos_context; | 
| 13
by Björn Påhlsson Added following support: | 176 | |
| 601
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Removed "simple_poll" | 177 | /* global so signal handler can reach it*/
 | 
| 178 | AvahiSimplePoll *simple_poll; | |
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 179 | |
| 371
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Always fail and | 180 | sig_atomic_t quit_now = 0; | 
| 181 | int signal_received = 0; | |
| 182 | ||
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 183 | /* Function to use when printing errors */
 | 
| 184 | void perror_plus(const char *print_text){ | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 185 | int e = errno; | 
| 485
by Teddy Hogeborn Merge from Björn. | 186 | fprintf(stderr, "Mandos plugin %s: ", | 
| 187 | program_invocation_short_name); | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 188 | errno = e; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 189 | perror(print_text); | 
| 190 | }
 | |
| 191 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 192 | __attribute__((format (gnu_printf, 2, 3), nonnull)) | 
| 505.2.4
by Björn Påhlsson New convinence error printer: fprintf_plus | 193 | int fprintf_plus(FILE *stream, const char *format, ...){ | 
| 194 | va_list ap; | |
| 195 | va_start (ap, format); | |
| 196 |   
 | |
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 197 | TEMP_FAILURE_RETRY(fprintf(stream, "Mandos plugin %s: ", | 
| 198 | program_invocation_short_name)); | |
| 622
by Teddy Hogeborn * debian/control (Build-Depends): Depend on debhelper 8.9.7 for using | 199 | return (int)TEMP_FAILURE_RETRY(vfprintf(stream, format, ap)); | 
| 505.2.4
by Björn Påhlsson New convinence error printer: fprintf_plus | 200 | }
 | 
| 201 | ||
| 43
by Teddy Hogeborn * plugins.d/mandosclient.c: Cosmetic changes. | 202 | /*
 | 
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 203 |  * Make additional room in "buffer" for at least BUFFER_SIZE more
 | 
| 204 |  * bytes. "buffer_capacity" is how much is currently allocated,
 | |
| 205 |  * "buffer_length" is how much is already used.
 | |
| 43
by Teddy Hogeborn * plugins.d/mandosclient.c: Cosmetic changes. | 206 |  */
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 207 | __attribute__((nonnull, warn_unused_result)) | 
| 24.1.132
by Björn Påhlsson Fixed a bug in fallback handling | 208 | size_t incbuffer(char **buffer, size_t buffer_length, | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 209 | size_t buffer_capacity){ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 210 | if(buffer_length + BUFFER_SIZE > buffer_capacity){ | 
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 211 | char *new_buf = realloc(*buffer, buffer_capacity + BUFFER_SIZE); | 
| 212 | if(new_buf == NULL){ | |
| 213 | int old_errno = errno; | |
| 214 | free(*buffer); | |
| 215 | errno = old_errno; | |
| 216 | *buffer = NULL; | |
| 24.1.10
by Björn Påhlsson merge commit | 217 | return 0; | 
| 218 | } | |
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 219 | *buffer = new_buf; | 
| 24.1.10
by Björn Påhlsson merge commit | 220 | buffer_capacity += BUFFER_SIZE; | 
| 221 | } | |
| 222 | return buffer_capacity; | |
| 223 | }
 | |
| 224 | ||
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 225 | /* Add server to set of servers to retry periodically */
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 226 | __attribute__((nonnull, warn_unused_result)) | 
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 227 | bool add_server(const char *ip, in_port_t port, AvahiIfIndex if_index, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 228 | int af, server **current_server){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 229 | int ret; | 
| 230 | server *new_server = malloc(sizeof(server)); | |
| 231 | if(new_server == NULL){ | |
| 232 | perror_plus("malloc"); | |
| 505.1.27
by teddy at bsnet * plugins.d/mandos-client.c (add_server): Return bool; all callers | 233 | return false; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 234 | } | 
| 235 | *new_server = (server){ .ip = strdup(ip), | |
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 236 | .port = port, | 
| 237 | .if_index = if_index, | |
| 238 | .af = af }; | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 239 | if(new_server->ip == NULL){ | 
| 240 | perror_plus("strdup"); | |
| 710
by Teddy Hogeborn mandos-client: Fix minor memory leak on memory full or clock failure. | 241 | free(new_server); | 
| 505.1.27
by teddy at bsnet * plugins.d/mandos-client.c (add_server): Return bool; all callers | 242 | return false; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 243 | } | 
| 668
by Teddy Hogeborn Do not add a new server to server list if clock_gettime() fails | 244 | ret = clock_gettime(CLOCK_MONOTONIC, &(new_server->last_seen)); | 
| 245 | if(ret == -1){ | |
| 246 | perror_plus("clock_gettime"); | |
| 714
by Teddy Hogeborn mandos-client: Fix mem free bug. | 247 | #ifdef __GNUC__
 | 
| 248 | #pragma GCC diagnostic push
 | |
| 249 | #pragma GCC diagnostic ignored "-Wcast-qual"
 | |
| 250 | #endif
 | |
| 251 | free((char *)(new_server->ip)); | |
| 252 | #ifdef __GNUC__
 | |
| 253 | #pragma GCC diagnostic pop
 | |
| 254 | #endif
 | |
| 710
by Teddy Hogeborn mandos-client: Fix minor memory leak on memory full or clock failure. | 255 | free(new_server); | 
| 668
by Teddy Hogeborn Do not add a new server to server list if clock_gettime() fails | 256 | return false; | 
| 257 | } | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 258 | /* Special case of first server */ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 259 | if(*current_server == NULL){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 260 | new_server->next = new_server; | 
| 261 | new_server->prev = new_server; | |
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 262 | *current_server = new_server; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 263 | } else { | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 264 | /* Place the new server last in the list */ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 265 | new_server->next = *current_server; | 
| 266 | new_server->prev = (*current_server)->prev; | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 267 | new_server->prev->next = new_server; | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 268 | (*current_server)->prev = new_server; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 269 | } | 
| 505.1.27
by teddy at bsnet * plugins.d/mandos-client.c (add_server): Return bool; all callers | 270 | return true; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 271 | }
 | 
| 272 | ||
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 273 | /* 
 | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 274 |  * Initialize GPGME.
 | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 275 |  */
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 276 | __attribute__((nonnull, warn_unused_result)) | 
| 673
by Teddy Hogeborn Make mandos-client prefer /run/tmp over /tmp. | 277 | static bool init_gpgme(const char * const seckey, | 
| 278 | const char * const pubkey, | |
| 279 | const char * const tempdir, | |
| 280 | mandos_context *mc){ | |
| 13
by Björn Påhlsson Added following support: | 281 | gpgme_error_t rc; | 
| 282 | gpgme_engine_info_t engine_info; | |
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 283 |   
 | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 284 | /* | 
| 288
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Use separate bool variable instead | 285 |    * Helper function to insert pub and seckey to the engine keyring.
 | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 286 |    */
 | 
| 673
by Teddy Hogeborn Make mandos-client prefer /run/tmp over /tmp. | 287 | bool import_key(const char * const filename){ | 
| 361
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gpgme): Move variable "ret" into the | 288 | int ret; | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 289 | int fd; | 
| 290 | gpgme_data_t pgp_data; | |
| 291 |     
 | |
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 292 | fd = (int)TEMP_FAILURE_RETRY(open(filename, O_RDONLY)); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 293 | if(fd == -1){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 294 | perror_plus("open"); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 295 | return false; | 
| 296 | } | |
| 297 |     
 | |
| 298 | rc = gpgme_data_new_from_fd(&pgp_data, fd); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 299 | if(rc != GPG_ERR_NO_ERROR){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 300 | fprintf_plus(stderr, "bad gpgme_data_new_from_fd: %s: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 301 | gpgme_strsource(rc), gpgme_strerror(rc)); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 302 | return false; | 
| 303 | } | |
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 304 |     
 | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 305 | rc = gpgme_op_import(mc->ctx, pgp_data); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 306 | if(rc != GPG_ERR_NO_ERROR){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 307 | fprintf_plus(stderr, "bad gpgme_op_import: %s: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 308 | gpgme_strsource(rc), gpgme_strerror(rc)); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 309 | return false; | 
| 310 | } | |
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 311 |     
 | 
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 312 | ret = close(fd); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 313 | if(ret == -1){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 314 | perror_plus("close"); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 315 | } | 
| 316 | gpgme_data_release(pgp_data); | |
| 317 | return true; | |
| 318 | } | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 319 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 320 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 321 | fprintf_plus(stderr, "Initializing GPGME\n"); | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 322 | } | 
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 323 |   
 | 
| 13
by Björn Påhlsson Added following support: | 324 | /* Init GPGME */ | 
| 325 | gpgme_check_version(NULL); | |
| 24.1.4
by Björn Påhlsson Added optional parameters certdir, certkey and certfile that can be iven at start in the command line. | 326 | rc = gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 327 | if(rc != GPG_ERR_NO_ERROR){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 328 | fprintf_plus(stderr, "bad gpgme_engine_check_version: %s: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 329 | gpgme_strsource(rc), gpgme_strerror(rc)); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 330 | return false; | 
| 24.1.4
by Björn Påhlsson Added optional parameters certdir, certkey and certfile that can be iven at start in the command line. | 331 | } | 
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 332 |   
 | 
| 492
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not even try to work around | 333 | /* Set GPGME home directory for the OpenPGP engine only */ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 334 | rc = gpgme_get_engine_info(&engine_info); | 
| 335 | if(rc != GPG_ERR_NO_ERROR){ | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 336 | fprintf_plus(stderr, "bad gpgme_get_engine_info: %s: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 337 | gpgme_strsource(rc), gpgme_strerror(rc)); | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 338 | return false; | 
| 13
by Björn Påhlsson Added following support: | 339 | } | 
| 340 | while(engine_info != NULL){ | |
| 341 | if(engine_info->protocol == GPGME_PROTOCOL_OpenPGP){ | |
| 342 | gpgme_set_engine_info(GPGME_PROTOCOL_OpenPGP, | |
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 343 | engine_info->file_name, tempdir); | 
| 13
by Björn Påhlsson Added following support: | 344 | break; | 
| 345 | } | |
| 346 | engine_info = engine_info->next; | |
| 347 | } | |
| 348 | if(engine_info == NULL){ | |
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 349 | fprintf_plus(stderr, "Could not set GPGME home dir to %s\n", | 
| 350 | tempdir); | |
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 351 | return false; | 
| 352 | } | |
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 353 |   
 | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 354 | /* Create new GPGME "context" */ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 355 | rc = gpgme_new(&(mc->ctx)); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 356 | if(rc != GPG_ERR_NO_ERROR){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 357 | fprintf_plus(stderr, "Mandos plugin mandos-client: " | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 358 | "bad gpgme_new: %s: %s\n", gpgme_strsource(rc), | 
| 359 | gpgme_strerror(rc)); | |
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 360 | return false; | 
| 361 | } | |
| 362 |   
 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 363 | if(not import_key(pubkey) or not import_key(seckey)){ | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 364 | return false; | 
| 365 | } | |
| 366 |   
 | |
| 355
by Teddy Hogeborn * mandos: White-space fixes only. | 367 | return true; | 
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 368 | }
 | 
| 369 | ||
| 370 | /* 
 | |
| 371 |  * Decrypt OpenPGP data.
 | |
| 372 |  * Returns -1 on error
 | |
| 373 |  */
 | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 374 | __attribute__((nonnull, warn_unused_result)) | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 375 | static ssize_t pgp_packet_decrypt(const char *cryptotext, | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 376 | size_t crypto_size, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 377 | char **plaintext, | 
| 378 | mandos_context *mc){ | |
| 24.1.81
by Björn Påhlsson removed keyring pre-requirement for starting password-request. | 379 | gpgme_data_t dh_crypto, dh_plain; | 
| 380 | gpgme_error_t rc; | |
| 381 | ssize_t ret; | |
| 382 | size_t plaintext_capacity = 0; | |
| 383 | ssize_t plaintext_length = 0; | |
| 384 |   
 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 385 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 386 | fprintf_plus(stderr, "Trying to decrypt OpenPGP data\n"); | 
| 13
by Björn Påhlsson Added following support: | 387 | } | 
| 388 |   
 | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 389 | /* Create new GPGME data buffer from memory cryptotext */ | 
| 390 | rc = gpgme_data_new_from_mem(&dh_crypto, cryptotext, crypto_size, | |
| 391 | 0); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 392 | if(rc != GPG_ERR_NO_ERROR){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 393 | fprintf_plus(stderr, "bad gpgme_data_new_from_mem: %s: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 394 | gpgme_strsource(rc), gpgme_strerror(rc)); | 
| 13
by Björn Påhlsson Added following support: | 395 | return -1; | 
| 396 | } | |
| 397 |   
 | |
| 398 | /* Create new empty GPGME data buffer for the plaintext */ | |
| 399 | rc = gpgme_data_new(&dh_plain); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 400 | if(rc != GPG_ERR_NO_ERROR){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 401 | fprintf_plus(stderr, "Mandos plugin mandos-client: " | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 402 | "bad gpgme_data_new: %s: %s\n", | 
| 403 | gpgme_strsource(rc), gpgme_strerror(rc)); | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 404 | gpgme_data_release(dh_crypto); | 
| 13
by Björn Påhlsson Added following support: | 405 | return -1; | 
| 406 | } | |
| 407 |   
 | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 408 | /* Decrypt data from the cryptotext data buffer to the plaintext | 
| 409 |      data buffer */
 | |
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 410 | rc = gpgme_op_decrypt(mc->ctx, dh_crypto, dh_plain); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 411 | if(rc != GPG_ERR_NO_ERROR){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 412 | fprintf_plus(stderr, "bad gpgme_op_decrypt: %s: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 413 | gpgme_strsource(rc), gpgme_strerror(rc)); | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 414 | plaintext_length = -1; | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 415 | if(debug){ | 
| 99
by Teddy Hogeborn * mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify. | 416 | gpgme_decrypt_result_t result; | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 417 | result = gpgme_op_decrypt_result(mc->ctx); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 418 | if(result == NULL){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 419 | fprintf_plus(stderr, "gpgme_op_decrypt_result failed\n"); | 
| 99
by Teddy Hogeborn * mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify. | 420 | } else { | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 421 | fprintf_plus(stderr, "Unsupported algorithm: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 422 | result->unsupported_algorithm); | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 423 | fprintf_plus(stderr, "Wrong key usage: %u\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 424 | result->wrong_key_usage); | 
| 99
by Teddy Hogeborn * mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify. | 425 | if(result->file_name != NULL){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 426 | fprintf_plus(stderr, "File name: %s\n", result->file_name); | 
| 99
by Teddy Hogeborn * mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify. | 427 | } | 
| 428 | gpgme_recipient_t recipient; | |
| 429 | recipient = result->recipients; | |
| 349
by Teddy Hogeborn * plugins.d/mandos-client.c (pgp_packet_decrypt): Remove redundant | 430 | while(recipient != NULL){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 431 | fprintf_plus(stderr, "Public key algorithm: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 432 | gpgme_pubkey_algo_name | 
| 433 | (recipient->pubkey_algo)); | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 434 | fprintf_plus(stderr, "Key ID: %s\n", recipient->keyid); | 
| 435 | fprintf_plus(stderr, "Secret key available: %s\n", | |
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 436 | recipient->status == GPG_ERR_NO_SECKEY | 
| 437 | ? "No" : "Yes"); | |
| 349
by Teddy Hogeborn * plugins.d/mandos-client.c (pgp_packet_decrypt): Remove redundant | 438 | recipient = recipient->next; | 
| 99
by Teddy Hogeborn * mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify. | 439 | } | 
| 440 | } | |
| 441 | } | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 442 | goto decrypt_end; | 
| 13
by Björn Påhlsson Added following support: | 443 | } | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 444 |   
 | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 445 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 446 | fprintf_plus(stderr, "Decryption of OpenPGP data succeeded\n"); | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 447 | } | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 448 |   
 | 
| 13
by Björn Påhlsson Added following support: | 449 | /* Seek back to the beginning of the GPGME plaintext data buffer */ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 450 | if(gpgme_data_seek(dh_plain, (off_t)0, SEEK_SET) == -1){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 451 | perror_plus("gpgme_data_seek"); | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 452 | plaintext_length = -1; | 
| 453 | goto decrypt_end; | |
| 24.1.5
by Björn Påhlsson plugbasedclient: | 454 | } | 
| 455 |   
 | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 456 | *plaintext = NULL; | 
| 13
by Björn Påhlsson Added following support: | 457 | while(true){ | 
| 24.1.132
by Björn Påhlsson Fixed a bug in fallback handling | 458 | plaintext_capacity = incbuffer(plaintext, | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 459 | (size_t)plaintext_length, | 
| 460 | plaintext_capacity); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 461 | if(plaintext_capacity == 0){ | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 462 | perror_plus("incbuffer"); | 
| 463 | plaintext_length = -1; | |
| 464 | goto decrypt_end; | |
| 13
by Björn Påhlsson Added following support: | 465 | } | 
| 466 |     
 | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 467 | ret = gpgme_data_read(dh_plain, *plaintext + plaintext_length, | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 468 | BUFFER_SIZE); | 
| 13
by Björn Påhlsson Added following support: | 469 | /* Print the data, if any */ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 470 | if(ret == 0){ | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 471 | /* EOF */ | 
| 13
by Björn Påhlsson Added following support: | 472 | break; | 
| 473 | } | |
| 474 | if(ret < 0){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 475 | perror_plus("gpgme_data_read"); | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 476 | plaintext_length = -1; | 
| 477 | goto decrypt_end; | |
| 13
by Björn Påhlsson Added following support: | 478 | } | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 479 | plaintext_length += ret; | 
| 13
by Björn Påhlsson Added following support: | 480 | } | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 481 |   
 | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 482 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 483 | fprintf_plus(stderr, "Decrypted password is: "); | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 484 | for(ssize_t i = 0; i < plaintext_length; i++){ | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 485 | fprintf(stderr, "%02hhX ", (*plaintext)[i]); | 
| 486 | } | |
| 487 | fprintf(stderr, "\n"); | |
| 488 | } | |
| 489 |   
 | |
| 490 | decrypt_end: | |
| 491 |   
 | |
| 492 | /* Delete the GPGME cryptotext data buffer */ | |
| 493 | gpgme_data_release(dh_crypto); | |
| 15.1.3
by Björn Påhlsson Added getopt_long support for mandosclient and passprompt | 494 |   
 | 
| 495 | /* Delete the GPGME plaintext data buffer */ | |
| 13
by Björn Påhlsson Added following support: | 496 | gpgme_data_release(dh_plain); | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 497 | return plaintext_length; | 
| 13
by Björn Påhlsson Added following support: | 498 | }
 | 
| 499 | ||
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 500 | __attribute__((warn_unused_result, const)) | 
| 501 | static const char *safe_string(const char *str){ | |
| 502 | if(str == NULL) | |
| 503 | return "(unknown)"; | |
| 504 | return str; | |
| 505 | }
 | |
| 506 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 507 | __attribute__((warn_unused_result)) | 
| 508 | static const char *safer_gnutls_strerror(int value){ | |
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 509 | const char *ret = gnutls_strerror(value); | 
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 510 | return safe_string(ret); | 
| 13
by Björn Påhlsson Added following support: | 511 | }
 | 
| 512 | ||
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 513 | /* GnuTLS log function callback */
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 514 | __attribute__((nonnull)) | 
| 36
by Teddy Hogeborn * TODO: Converted to org-mode style | 515 | static void debuggnutls(__attribute__((unused)) int level, | 
| 516 | const char* string){ | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 517 | fprintf_plus(stderr, "GnuTLS: %s", string); | 
| 13
by Björn Påhlsson Added following support: | 518 | }
 | 
| 519 | ||
| 811
by Teddy Hogeborn Client: Remove an incorrect "nonnull" attribute | 520 | __attribute__((nonnull(1, 2, 4), warn_unused_result)) | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 521 | static int init_gnutls_global(const char *pubkeyfilename, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 522 | const char *seckeyfilename, | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 523 | const char *dhparamsfilename, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 524 | mandos_context *mc){ | 
| 13
by Björn Påhlsson Added following support: | 525 | int ret; | 
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 526 | unsigned int uret; | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 527 |   
 | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 528 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 529 | fprintf_plus(stderr, "Initializing GnuTLS\n"); | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 530 | } | 
| 24.1.29
by Björn Påhlsson Added more header file comments | 531 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 532 | if(debug){ | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 533 | /* "Use a log level over 10 to enable all debugging options." | 
| 534 |      * - GnuTLS manual
 | |
| 535 |      */
 | |
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 536 | gnutls_global_set_log_level(11); | 
| 537 | gnutls_global_set_log_function(debuggnutls); | |
| 538 | } | |
| 539 |   
 | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 540 | /* OpenPGP credentials */ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 541 | ret = gnutls_certificate_allocate_credentials(&mc->cred); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 542 | if(ret != GNUTLS_E_SUCCESS){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 543 | fprintf_plus(stderr, "GnuTLS memory error: %s\n", | 
| 544 | safer_gnutls_strerror(ret)); | |
| 13
by Björn Påhlsson Added following support: | 545 | return -1; | 
| 546 | } | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 547 |   
 | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 548 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 549 | fprintf_plus(stderr, "Attempting to use OpenPGP public key %s and" | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 550 | " secret key %s as GnuTLS credentials\n", | 
| 551 | pubkeyfilename, | |
| 552 | seckeyfilename); | |
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 553 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 554 |   
 | 
| 13
by Björn Påhlsson Added following support: | 555 | ret = gnutls_certificate_set_openpgp_key_file | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 556 | (mc->cred, pubkeyfilename, seckeyfilename, | 
| 76
by Teddy Hogeborn * plugins.d/password-request.c (init_gnutls_global): Renamed | 557 | GNUTLS_OPENPGP_FMT_BASE64); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 558 | if(ret != GNUTLS_E_SUCCESS){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 559 | fprintf_plus(stderr, | 
| 560 | "Error[%d] while reading the OpenPGP key pair ('%s'," | |
| 561 | " '%s')\n", ret, pubkeyfilename, seckeyfilename); | |
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 562 | fprintf_plus(stderr, "The GnuTLS error is: %s\n", | 
| 563 | safer_gnutls_strerror(ret)); | |
| 24.1.20
by Björn Påhlsson mandosclient | 564 | goto globalfail; | 
| 13
by Björn Påhlsson Added following support: | 565 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 566 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 567 | /* GnuTLS server initialization */ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 568 | ret = gnutls_dh_params_init(&mc->dh_params); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 569 | if(ret != GNUTLS_E_SUCCESS){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 570 | fprintf_plus(stderr, "Error in GnuTLS DH parameter" | 
| 571 | " initialization: %s\n", | |
| 572 | safer_gnutls_strerror(ret)); | |
| 24.1.20
by Björn Påhlsson mandosclient | 573 | goto globalfail; | 
| 13
by Björn Påhlsson Added following support: | 574 | } | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 575 | /* If a Diffie-Hellman parameters file was given, try to use it */ | 
| 576 | if(dhparamsfilename != NULL){ | |
| 577 | gnutls_datum_t params = { .data = NULL, .size = 0 }; | |
| 578 | do { | |
| 579 | int dhpfile = open(dhparamsfilename, O_RDONLY); | |
| 580 | if(dhpfile == -1){ | |
| 581 | perror_plus("open"); | |
| 582 | dhparamsfilename = NULL; | |
| 583 | break; | |
| 584 | } | |
| 585 | size_t params_capacity = 0; | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 586 | while(true){ | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 587 | params_capacity = incbuffer((char **)¶ms.data, | 
| 588 | (size_t)params.size, | |
| 589 | (size_t)params_capacity); | |
| 590 | if(params_capacity == 0){ | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 591 | perror_plus("incbuffer"); | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 592 | free(params.data); | 
| 593 | params.data = NULL; | |
| 594 | dhparamsfilename = NULL; | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 595 | break; | 
| 596 | } | |
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 597 | ssize_t bytes_read = read(dhpfile, | 
| 598 | params.data + params.size, | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 599 | BUFFER_SIZE); | 
| 600 | /* EOF */ | |
| 601 | if(bytes_read == 0){ | |
| 602 | break; | |
| 603 | } | |
| 604 | /* check bytes_read for failure */ | |
| 605 | if(bytes_read < 0){ | |
| 606 | perror_plus("read"); | |
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 607 | free(params.data); | 
| 608 | params.data = NULL; | |
| 609 | dhparamsfilename = NULL; | |
| 610 | break; | |
| 611 | } | |
| 612 | params.size += (unsigned int)bytes_read; | |
| 613 | } | |
| 614 | if(params.data == NULL){ | |
| 615 | dhparamsfilename = NULL; | |
| 616 | } | |
| 617 | if(dhparamsfilename == NULL){ | |
| 618 | break; | |
| 619 | } | |
| 620 | ret = gnutls_dh_params_import_pkcs3(mc->dh_params, ¶ms, | |
| 621 | GNUTLS_X509_FMT_PEM); | |
| 622 | if(ret != GNUTLS_E_SUCCESS){ | |
| 623 | fprintf_plus(stderr, "Failed to parse DH parameters in file" | |
| 624 | " \"%s\": %s\n", dhparamsfilename, | |
| 625 | safer_gnutls_strerror(ret)); | |
| 626 | dhparamsfilename = NULL; | |
| 627 | } | |
| 628 | } while(false); | |
| 629 | } | |
| 630 | if(dhparamsfilename == NULL){ | |
| 631 | if(mc->dh_bits == 0){ | |
| 632 | /* Find out the optimal number of DH bits */ | |
| 633 | /* Try to read the private key file */ | |
| 634 | gnutls_datum_t buffer = { .data = NULL, .size = 0 }; | |
| 635 | do { | |
| 636 | int secfile = open(seckeyfilename, O_RDONLY); | |
| 637 | if(secfile == -1){ | |
| 638 | perror_plus("open"); | |
| 639 | break; | |
| 640 | } | |
| 641 | size_t buffer_capacity = 0; | |
| 642 | while(true){ | |
| 643 | buffer_capacity = incbuffer((char **)&buffer.data, | |
| 644 | (size_t)buffer.size, | |
| 645 | (size_t)buffer_capacity); | |
| 646 | if(buffer_capacity == 0){ | |
| 647 | perror_plus("incbuffer"); | |
| 648 | free(buffer.data); | |
| 649 | buffer.data = NULL; | |
| 650 | break; | |
| 651 | } | |
| 652 | ssize_t bytes_read = read(secfile, | |
| 653 | buffer.data + buffer.size, | |
| 654 | BUFFER_SIZE); | |
| 655 | /* EOF */ | |
| 656 | if(bytes_read == 0){ | |
| 657 | break; | |
| 658 | } | |
| 659 | /* check bytes_read for failure */ | |
| 660 | if(bytes_read < 0){ | |
| 661 | perror_plus("read"); | |
| 662 | free(buffer.data); | |
| 663 | buffer.data = NULL; | |
| 664 | break; | |
| 665 | } | |
| 666 | buffer.size += (unsigned int)bytes_read; | |
| 667 | } | |
| 668 | close(secfile); | |
| 669 | } while(false); | |
| 670 | /* If successful, use buffer to parse private key */ | |
| 671 | gnutls_sec_param_t sec_param = GNUTLS_SEC_PARAM_ULTRA; | |
| 672 | if(buffer.data != NULL){ | |
| 673 | { | |
| 674 | gnutls_openpgp_privkey_t privkey = NULL; | |
| 675 | ret = gnutls_openpgp_privkey_init(&privkey); | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 676 | if(ret != GNUTLS_E_SUCCESS){ | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 677 | fprintf_plus(stderr, "Error initializing OpenPGP key" | 
| 678 | " structure: %s", | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 679 | safer_gnutls_strerror(ret)); | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 680 | free(buffer.data); | 
| 681 | buffer.data = NULL; | |
| 682 | } else { | |
| 683 | ret = gnutls_openpgp_privkey_import | |
| 684 | (privkey, &buffer, GNUTLS_OPENPGP_FMT_BASE64, "", 0); | |
| 685 | if(ret != GNUTLS_E_SUCCESS){ | |
| 686 | fprintf_plus(stderr, "Error importing OpenPGP key : %s", | |
| 687 | safer_gnutls_strerror(ret)); | |
| 688 | privkey = NULL; | |
| 689 | } | |
| 690 | free(buffer.data); | |
| 691 | buffer.data = NULL; | |
| 692 | if(privkey != NULL){ | |
| 693 | /* Use private key to suggest an appropriate | |
| 694 | 		 sec_param */
 | |
| 695 | sec_param = gnutls_openpgp_privkey_sec_param(privkey); | |
| 696 | gnutls_openpgp_privkey_deinit(privkey); | |
| 697 | if(debug){ | |
| 698 | fprintf_plus(stderr, "This OpenPGP key implies using" | |
| 699 | " a GnuTLS security parameter \"%s\".\n", | |
| 700 | safe_string(gnutls_sec_param_get_name | |
| 701 | (sec_param))); | |
| 702 | } | |
| 703 | } | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 704 | } | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 705 | } | 
| 706 | if(sec_param == GNUTLS_SEC_PARAM_UNKNOWN){ | |
| 707 | /* Err on the side of caution */ | |
| 708 | sec_param = GNUTLS_SEC_PARAM_ULTRA; | |
| 709 | if(debug){ | |
| 710 | fprintf_plus(stderr, "Falling back to security parameter" | |
| 711 | " \"%s\"\n", | |
| 712 | safe_string(gnutls_sec_param_get_name | |
| 713 | (sec_param))); | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 714 | } | 
| 715 | } | |
| 716 | } | |
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 717 | uret = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, sec_param); | 
| 718 | if(uret != 0){ | |
| 719 | mc->dh_bits = uret; | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 720 | if(debug){ | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 721 | fprintf_plus(stderr, "A \"%s\" GnuTLS security parameter" | 
| 722 | " implies %u DH bits; using that.\n", | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 723 | safe_string(gnutls_sec_param_get_name | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 724 | (sec_param)), | 
| 725 | mc->dh_bits); | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 726 | } | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 727 | } else { | 
| 728 | fprintf_plus(stderr, "Failed to get implied number of DH" | |
| 729 | " bits for security parameter \"%s\"): %s\n", | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 730 | safe_string(gnutls_sec_param_get_name | 
| 731 | (sec_param)), | |
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 732 | safer_gnutls_strerror(ret)); | 
| 733 | goto globalfail; | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 734 | } | 
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 735 | } else if(debug){ | 
| 736 | fprintf_plus(stderr, "DH bits explicitly set to %u\n", | |
| 737 | mc->dh_bits); | |
| 738 | } | |
| 739 | ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits); | |
| 740 | if(ret != GNUTLS_E_SUCCESS){ | |
| 741 | fprintf_plus(stderr, "Error in GnuTLS prime generation (%u" | |
| 742 | " bits): %s\n", mc->dh_bits, | |
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 743 | safer_gnutls_strerror(ret)); | 
| 744 | goto globalfail; | |
| 745 | } | |
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 746 | } | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 747 | gnutls_certificate_set_dh_params(mc->cred, mc->dh_params); | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 748 |   
 | 
| 24.1.13
by Björn Påhlsson mandosclient | 749 | return 0; | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 750 |   
 | 
| 24.1.20
by Björn Påhlsson mandosclient | 751 | globalfail: | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 752 |   
 | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 753 | gnutls_certificate_free_credentials(mc->cred); | 
| 754 | gnutls_dh_params_deinit(mc->dh_params); | |
| 24.1.20
by Björn Påhlsson mandosclient | 755 | return -1; | 
| 24.1.13
by Björn Påhlsson mandosclient | 756 | }
 | 
| 757 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 758 | __attribute__((nonnull, warn_unused_result)) | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 759 | static int init_gnutls_session(gnutls_session_t *session, | 
| 760 | mandos_context *mc){ | |
| 24.1.13
by Björn Påhlsson mandosclient | 761 | int ret; | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 762 | /* GnuTLS session creation */ | 
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 763 | do { | 
| 764 | ret = gnutls_init(session, GNUTLS_SERVER); | |
| 371
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Always fail and | 765 | if(quit_now){ | 
| 766 | return -1; | |
| 767 | } | |
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 768 | } while(ret == GNUTLS_E_INTERRUPTED or ret == GNUTLS_E_AGAIN); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 769 | if(ret != GNUTLS_E_SUCCESS){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 770 | fprintf_plus(stderr, | 
| 771 | "Error in GnuTLS session initialization: %s\n", | |
| 772 | safer_gnutls_strerror(ret)); | |
| 13
by Björn Påhlsson Added following support: | 773 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 774 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 775 | { | 
| 776 | const char *err; | |
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 777 | do { | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 778 | ret = gnutls_priority_set_direct(*session, mc->priority, &err); | 
| 371
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Always fail and | 779 | if(quit_now){ | 
| 780 | gnutls_deinit(*session); | |
| 781 | return -1; | |
| 782 | } | |
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 783 | } while(ret == GNUTLS_E_INTERRUPTED or ret == GNUTLS_E_AGAIN); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 784 | if(ret != GNUTLS_E_SUCCESS){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 785 | fprintf_plus(stderr, "Syntax error at: %s\n", err); | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 786 | fprintf_plus(stderr, "GnuTLS error: %s\n", | 
| 787 | safer_gnutls_strerror(ret)); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 788 | gnutls_deinit(*session); | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 789 | return -1; | 
| 790 | } | |
| 13
by Björn Påhlsson Added following support: | 791 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 792 |   
 | 
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 793 | do { | 
| 794 | ret = gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE, | |
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 795 | mc->cred); | 
| 371
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Always fail and | 796 | if(quit_now){ | 
| 797 | gnutls_deinit(*session); | |
| 798 | return -1; | |
| 799 | } | |
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 800 | } while(ret == GNUTLS_E_INTERRUPTED or ret == GNUTLS_E_AGAIN); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 801 | if(ret != GNUTLS_E_SUCCESS){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 802 | fprintf_plus(stderr, "Error setting GnuTLS credentials: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 803 | safer_gnutls_strerror(ret)); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 804 | gnutls_deinit(*session); | 
| 13
by Björn Påhlsson Added following support: | 805 | return -1; | 
| 806 | } | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 807 |   
 | 
| 13
by Björn Påhlsson Added following support: | 808 | /* ignore client certificate if any. */ | 
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 809 | gnutls_certificate_server_set_request(*session, GNUTLS_CERT_IGNORE); | 
| 13
by Björn Påhlsson Added following support: | 810 |   
 | 
| 811 | return 0; | |
| 812 | }
 | |
| 813 | ||
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 814 | /* Avahi log function callback */
 | 
| 36
by Teddy Hogeborn * TODO: Converted to org-mode style | 815 | static void empty_log(__attribute__((unused)) AvahiLogLevel level, | 
| 816 | __attribute__((unused)) const char *txt){} | |
| 13
by Björn Påhlsson Added following support: | 817 | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 818 | /* Set effective uid to 0, return errno */
 | 
| 819 | __attribute__((warn_unused_result)) | |
| 819
by Teddy Hogeborn errno is of type int, not error_t | 820 | int raise_privileges(void){ | 
| 821 | int old_errno = errno; | |
| 822 | int ret = 0; | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 823 | if(seteuid(0) == -1){ | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 824 | ret = errno; | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 825 | } | 
| 826 | errno = old_errno; | |
| 819
by Teddy Hogeborn errno is of type int, not error_t | 827 | return ret; | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 828 | }
 | 
| 829 | ||
| 830 | /* Set effective and real user ID to 0.  Return errno. */
 | |
| 831 | __attribute__((warn_unused_result)) | |
| 819
by Teddy Hogeborn errno is of type int, not error_t | 832 | int raise_privileges_permanently(void){ | 
| 833 | int old_errno = errno; | |
| 834 | int ret = raise_privileges(); | |
| 835 | if(ret != 0){ | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 836 | errno = old_errno; | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 837 | return ret; | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 838 | } | 
| 839 | if(setuid(0) == -1){ | |
| 819
by Teddy Hogeborn errno is of type int, not error_t | 840 | ret = errno; | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 841 | } | 
| 842 | errno = old_errno; | |
| 819
by Teddy Hogeborn errno is of type int, not error_t | 843 | return ret; | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 844 | }
 | 
| 845 | ||
| 846 | /* Set effective user ID to unprivileged saved user ID */
 | |
| 847 | __attribute__((warn_unused_result)) | |
| 819
by Teddy Hogeborn errno is of type int, not error_t | 848 | int lower_privileges(void){ | 
| 849 | int old_errno = errno; | |
| 850 | int ret = 0; | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 851 | if(seteuid(uid) == -1){ | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 852 | ret = errno; | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 853 | } | 
| 854 | errno = old_errno; | |
| 819
by Teddy Hogeborn errno is of type int, not error_t | 855 | return ret; | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 856 | }
 | 
| 857 | ||
| 858 | /* Lower privileges permanently */
 | |
| 859 | __attribute__((warn_unused_result)) | |
| 819
by Teddy Hogeborn errno is of type int, not error_t | 860 | int lower_privileges_permanently(void){ | 
| 861 | int old_errno = errno; | |
| 862 | int ret = 0; | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 863 | if(setuid(uid) == -1){ | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 864 | ret = errno; | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 865 | } | 
| 866 | errno = old_errno; | |
| 819
by Teddy Hogeborn errno is of type int, not error_t | 867 | return ret; | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 868 | }
 | 
| 869 | ||
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 870 | /* Helper function to add_local_route() and delete_local_route() */
 | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 871 | __attribute__((nonnull, warn_unused_result)) | 
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 872 | static bool add_delete_local_route(const bool add, | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 873 | const char *address, | 
| 874 | AvahiIfIndex if_index){ | |
| 875 | int ret; | |
| 876 | char helper[] = "mandos-client-iprouteadddel"; | |
| 877 | char add_arg[] = "add"; | |
| 738.1.4
by Teddy Hogeborn Add plugin for mandos-client to add and delete local routes. | 878 | char delete_arg[] = "delete"; | 
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 879 | char debug_flag[] = "--debug"; | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 880 | char *pluginhelperdir = getenv("MANDOSPLUGINHELPERDIR"); | 
| 881 | if(pluginhelperdir == NULL){ | |
| 882 | if(debug){ | |
| 883 | fprintf_plus(stderr, "MANDOSPLUGINHELPERDIR environment" | |
| 884 | " variable not set; cannot run helper\n"); | |
| 885 | } | |
| 886 | return false; | |
| 887 | } | |
| 888 |   
 | |
| 889 | char interface[IF_NAMESIZE]; | |
| 890 | if(if_indextoname((unsigned int)if_index, interface) == NULL){ | |
| 891 | perror_plus("if_indextoname"); | |
| 892 | return false; | |
| 893 | } | |
| 894 |   
 | |
| 895 | int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY)); | |
| 896 | if(devnull == -1){ | |
| 897 | perror_plus("open(\"/dev/null\", O_RDONLY)"); | |
| 898 | return false; | |
| 899 | } | |
| 900 | pid_t pid = fork(); | |
| 901 | if(pid == 0){ | |
| 902 | /* Child */ | |
| 903 | /* Raise privileges */ | |
| 904 | errno = raise_privileges_permanently(); | |
| 905 | if(errno != 0){ | |
| 906 | perror_plus("Failed to raise privileges"); | |
| 907 | /* _exit(EX_NOPERM); */ | |
| 908 | } else { | |
| 909 | /* Set group */ | |
| 910 | errno = 0; | |
| 911 | ret = setgid(0); | |
| 912 | if(ret == -1){ | |
| 913 | perror_plus("setgid"); | |
| 914 | _exit(EX_NOPERM); | |
| 915 | } | |
| 916 | /* Reset supplementary groups */ | |
| 917 | errno = 0; | |
| 918 | ret = setgroups(0, NULL); | |
| 919 | if(ret == -1){ | |
| 920 | perror_plus("setgroups"); | |
| 921 | _exit(EX_NOPERM); | |
| 922 | } | |
| 923 | } | |
| 924 | ret = dup2(devnull, STDIN_FILENO); | |
| 925 | if(ret == -1){ | |
| 926 | perror_plus("dup2(devnull, STDIN_FILENO)"); | |
| 927 | _exit(EX_OSERR); | |
| 928 | } | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 929 | ret = close(devnull); | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 930 | if(ret == -1){ | 
| 931 | perror_plus("close"); | |
| 932 | _exit(EX_OSERR); | |
| 933 | } | |
| 934 | ret = dup2(STDERR_FILENO, STDOUT_FILENO); | |
| 935 | if(ret == -1){ | |
| 936 | perror_plus("dup2(STDERR_FILENO, STDOUT_FILENO)"); | |
| 937 | _exit(EX_OSERR); | |
| 938 | } | |
| 939 | int helperdir_fd = (int)TEMP_FAILURE_RETRY(open(pluginhelperdir, | |
| 940 | O_RDONLY | |
| 941 | | O_DIRECTORY | |
| 942 | | O_PATH | |
| 943 | | O_CLOEXEC)); | |
| 738.1.3
by Teddy Hogeborn mandos-client: Minor changes to check for more error conditions. | 944 | if(helperdir_fd == -1){ | 
| 945 | perror_plus("open"); | |
| 946 | _exit(EX_UNAVAILABLE); | |
| 947 | } | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 948 | int helper_fd = (int)TEMP_FAILURE_RETRY(openat(helperdir_fd, | 
| 949 | helper, O_RDONLY)); | |
| 738.1.3
by Teddy Hogeborn mandos-client: Minor changes to check for more error conditions. | 950 | if(helper_fd == -1){ | 
| 951 | perror_plus("openat"); | |
| 775
by Teddy Hogeborn plugin-runner: Minor fix: close helperdir before exiting in fork. | 952 | close(helperdir_fd); | 
| 738.1.3
by Teddy Hogeborn mandos-client: Minor changes to check for more error conditions. | 953 | _exit(EX_UNAVAILABLE); | 
| 954 | } | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 955 | close(helperdir_fd); | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 956 | #ifdef __GNUC__
 | 
| 957 | #pragma GCC diagnostic push
 | |
| 958 | #pragma GCC diagnostic ignored "-Wcast-qual"
 | |
| 959 | #endif
 | |
| 960 | if(fexecve(helper_fd, (char *const []) | |
| 738.1.4
by Teddy Hogeborn Add plugin for mandos-client to add and delete local routes. | 961 | { helper, add ? add_arg : delete_arg, (char *)address, | 
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 962 | interface, debug ? debug_flag : NULL, NULL }, | 
| 963 | environ) == -1){ | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 964 | #ifdef __GNUC__
 | 
| 965 | #pragma GCC diagnostic pop
 | |
| 966 | #endif
 | |
| 967 | perror_plus("fexecve"); | |
| 968 | _exit(EXIT_FAILURE); | |
| 969 | } | |
| 970 | } | |
| 971 | if(pid == -1){ | |
| 972 | perror_plus("fork"); | |
| 973 | return false; | |
| 974 | } | |
| 975 | int status; | |
| 976 | pid_t pret = -1; | |
| 977 | errno = 0; | |
| 978 | do { | |
| 979 | pret = waitpid(pid, &status, 0); | |
| 980 | if(pret == -1 and errno == EINTR and quit_now){ | |
| 981 | int errno_raising = 0; | |
| 982 | if((errno = raise_privileges()) != 0){ | |
| 983 | errno_raising = errno; | |
| 984 | perror_plus("Failed to raise privileges in order to" | |
| 985 | " kill helper program"); | |
| 986 | } | |
| 987 | if(kill(pid, SIGTERM) == -1){ | |
| 988 | perror_plus("kill"); | |
| 989 | } | |
| 990 | if((errno_raising == 0) and (errno = lower_privileges()) != 0){ | |
| 991 | perror_plus("Failed to lower privileges after killing" | |
| 992 | " helper program"); | |
| 993 | } | |
| 994 | return false; | |
| 995 | } | |
| 996 | } while(pret == -1 and errno == EINTR); | |
| 997 | if(pret == -1){ | |
| 998 | perror_plus("waitpid"); | |
| 999 | return false; | |
| 1000 | } | |
| 1001 | if(WIFEXITED(status)){ | |
| 1002 | if(WEXITSTATUS(status) != 0){ | |
| 1003 | fprintf_plus(stderr, "Error: iprouteadddel exited" | |
| 1004 | " with status %d\n", WEXITSTATUS(status)); | |
| 1005 | return false; | |
| 1006 | } | |
| 1007 | return true; | |
| 1008 | } | |
| 1009 | if(WIFSIGNALED(status)){ | |
| 1010 | fprintf_plus(stderr, "Error: iprouteadddel died by" | |
| 1011 | " signal %d\n", WTERMSIG(status)); | |
| 1012 | return false; | |
| 1013 | } | |
| 1014 | fprintf_plus(stderr, "Error: iprouteadddel crashed\n"); | |
| 1015 | return false; | |
| 1016 | }
 | |
| 1017 | ||
| 1018 | __attribute__((nonnull, warn_unused_result)) | |
| 1019 | static bool add_local_route(const char *address, | |
| 1020 | AvahiIfIndex if_index){ | |
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 1021 | if(debug){ | 
| 1022 | fprintf_plus(stderr, "Adding route to %s\n", address); | |
| 1023 | } | |
| 1024 | return add_delete_local_route(true, address, if_index); | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1025 | }
 | 
| 1026 | ||
| 1027 | __attribute__((nonnull, warn_unused_result)) | |
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 1028 | static bool delete_local_route(const char *address, | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1029 | AvahiIfIndex if_index){ | 
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 1030 | if(debug){ | 
| 1031 | fprintf_plus(stderr, "Removing route to %s\n", address); | |
| 1032 | } | |
| 1033 | return add_delete_local_route(false, address, if_index); | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1034 | }
 | 
| 1035 | ||
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1036 | /* Called when a Mandos server is found */
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1037 | __attribute__((nonnull, warn_unused_result)) | 
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 1038 | static int start_mandos_communication(const char *ip, in_port_t port, | 
| 24.1.9
by Björn Påhlsson not working midwork... | 1039 | AvahiIfIndex if_index, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1040 | int af, mandos_context *mc){ | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1041 | int ret, tcp_sd = -1; | 
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 1042 | ssize_t sret; | 
| 669
by Teddy Hogeborn Use "struct sockaddr_storage" instead of a union in mandos-client. | 1043 | struct sockaddr_storage to; | 
| 13
by Björn Påhlsson Added following support: | 1044 | char *buffer = NULL; | 
| 372
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Bug fix: | 1045 | char *decrypted_buffer = NULL; | 
| 13
by Björn Påhlsson Added following support: | 1046 | size_t buffer_length = 0; | 
| 1047 | size_t buffer_capacity = 0; | |
| 24.1.10
by Björn Påhlsson merge commit | 1048 | size_t written; | 
| 372
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Bug fix: | 1049 | int retval = -1; | 
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 1050 | gnutls_session_t session; | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1051 | int pf; /* Protocol family */ | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1052 | bool route_added = false; | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1053 |   
 | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1054 | errno = 0; | 
| 1055 |   
 | |
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1056 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1057 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1058 | return -1; | 
| 1059 | } | |
| 1060 |   
 | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1061 | switch(af){ | 
| 1062 | case AF_INET6: | |
| 1063 | pf = PF_INET6; | |
| 1064 | break; | |
| 1065 | case AF_INET: | |
| 1066 | pf = PF_INET; | |
| 1067 | break; | |
| 1068 | default: | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1069 | fprintf_plus(stderr, "Bad address family: %d\n", af); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1070 | errno = EINVAL; | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1071 | return -1; | 
| 1072 | } | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1073 |   
 | 
| 605
by Teddy Hogeborn * plugins.d/mandos-client.c: Comment changes | 1074 | /* If the interface is specified and we have a list of interfaces */ | 
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 1075 | if(if_index != AVAHI_IF_UNSPEC and mc->interfaces != NULL){ | 
| 1076 | /* Check if the interface is one of the interfaces we are using */ | |
| 1077 | bool match = false; | |
| 1078 | { | |
| 1079 | char *interface = NULL; | |
| 1080 | while((interface=argz_next(mc->interfaces, mc->interfaces_size, | |
| 1081 | interface))){ | |
| 1082 | if(if_nametoindex(interface) == (unsigned int)if_index){ | |
| 1083 | match = true; | |
| 1084 | break; | |
| 1085 | } | |
| 1086 | } | |
| 1087 | } | |
| 1088 | if(not match){ | |
| 605
by Teddy Hogeborn * plugins.d/mandos-client.c: Comment changes | 1089 | /* This interface does not match any in the list, so we don't | 
| 1090 | 	 connect to the server */
 | |
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 1091 | if(debug){ | 
| 1092 | char interface[IF_NAMESIZE]; | |
| 1093 | if(if_indextoname((unsigned int)if_index, interface) == NULL){ | |
| 1094 | perror_plus("if_indextoname"); | |
| 1095 | } else { | |
| 1096 | fprintf_plus(stderr, "Skipping server on non-used interface" | |
| 1097 | " \"%s\"\n", | |
| 1098 | if_indextoname((unsigned int)if_index, | |
| 1099 | interface)); | |
| 1100 | } | |
| 1101 | } | |
| 1102 | return -1; | |
| 1103 | } | |
| 1104 | } | |
| 1105 |   
 | |
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1106 | ret = init_gnutls_session(&session, mc); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1107 | if(ret != 0){ | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1108 | return -1; | 
| 1109 | } | |
| 1110 |   
 | |
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 1111 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1112 | fprintf_plus(stderr, "Setting up a TCP connection to %s, port %" | 
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 1113 | PRIuMAX "\n", ip, (uintmax_t)port); | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 1114 | } | 
| 13
by Björn Påhlsson Added following support: | 1115 |   
 | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1116 | tcp_sd = socket(pf, SOCK_STREAM | SOCK_CLOEXEC, 0); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1117 | if(tcp_sd < 0){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1118 | int e = errno; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1119 | perror_plus("socket"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1120 | errno = e; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1121 | goto mandos_end; | 
| 1122 | } | |
| 1123 |   
 | |
| 1124 | if(quit_now){ | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1125 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1126 | goto mandos_end; | 
| 13
by Björn Påhlsson Added following support: | 1127 | } | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 1128 |   
 | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1129 | if(af == AF_INET6){ | 
| 773
by Teddy Hogeborn mandos-client: Don't use memset(). | 1130 | struct sockaddr_in6 *to6 = (struct sockaddr_in6 *)&to; | 
| 1131 | *to6 = (struct sockaddr_in6){ .sin6_family = (sa_family_t)af }; | |
| 1132 | ret = inet_pton(af, ip, &to6->sin6_addr); | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1133 | } else { /* IPv4 */ | 
| 773
by Teddy Hogeborn mandos-client: Don't use memset(). | 1134 | struct sockaddr_in *to4 = (struct sockaddr_in *)&to; | 
| 1135 | *to4 = (struct sockaddr_in){ .sin_family = (sa_family_t)af }; | |
| 1136 | ret = inet_pton(af, ip, &to4->sin_addr); | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1137 | } | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1138 | if(ret < 0 ){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1139 | int e = errno; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1140 | perror_plus("inet_pton"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1141 | errno = e; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1142 | goto mandos_end; | 
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 1143 | } | 
| 13
by Björn Påhlsson Added following support: | 1144 | if(ret == 0){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1145 | int e = errno; | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1146 | fprintf_plus(stderr, "Bad address: %s\n", ip); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1147 | errno = e; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1148 | goto mandos_end; | 
| 13
by Björn Påhlsson Added following support: | 1149 | } | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1150 | if(af == AF_INET6){ | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1151 | ((struct sockaddr_in6 *)&to)->sin6_port = htons(port); | 
| 669
by Teddy Hogeborn Use "struct sockaddr_storage" instead of a union in mandos-client. | 1152 | if(IN6_IS_ADDR_LINKLOCAL | 
| 1153 | (&((struct sockaddr_in6 *)&to)->sin6_addr)){ | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1154 | if(if_index == AVAHI_IF_UNSPEC){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1155 | fprintf_plus(stderr, "An IPv6 link-local address is" | 
| 1156 | " incomplete without a network interface\n"); | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1157 | errno = EINVAL; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1158 | goto mandos_end; | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1159 | } | 
| 1160 | /* Set the network interface number as scope */ | |
| 669
by Teddy Hogeborn Use "struct sockaddr_storage" instead of a union in mandos-client. | 1161 | ((struct sockaddr_in6 *)&to)->sin6_scope_id = (uint32_t)if_index; | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1162 | } | 
| 1163 | } else { | |
| 669
by Teddy Hogeborn Use "struct sockaddr_storage" instead of a union in mandos-client. | 1164 | ((struct sockaddr_in *)&to)->sin_port = htons(port); | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1165 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1166 |   
 | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1167 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1168 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1169 | goto mandos_end; | 
| 1170 | } | |
| 1171 |   
 | |
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 1172 | if(debug){ | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1173 | if(af == AF_INET6 and if_index != AVAHI_IF_UNSPEC){ | 
| 1174 | char interface[IF_NAMESIZE]; | |
| 1175 | if(if_indextoname((unsigned int)if_index, interface) == NULL){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1176 | perror_plus("if_indextoname"); | 
| 304
by Teddy Hogeborn Four new interrelated features: | 1177 | } else { | 
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 1178 | fprintf_plus(stderr, "Connection to: %s%%%s, port %" PRIuMAX | 
| 1179 | "\n", ip, interface, (uintmax_t)port); | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1180 | } | 
| 1181 | } else { | |
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 1182 | fprintf_plus(stderr, "Connection to: %s, port %" PRIuMAX "\n", | 
| 1183 | ip, (uintmax_t)port); | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1184 | } | 
| 1185 | char addrstr[(INET_ADDRSTRLEN > INET6_ADDRSTRLEN) ? | |
| 1186 | INET_ADDRSTRLEN : INET6_ADDRSTRLEN] = ""; | |
| 1187 | if(af == AF_INET6){ | |
| 669
by Teddy Hogeborn Use "struct sockaddr_storage" instead of a union in mandos-client. | 1188 | ret = getnameinfo((struct sockaddr *)&to, | 
| 1189 | sizeof(struct sockaddr_in6), | |
| 667
by Teddy Hogeborn Use getnameinfo() instead of inet_ntop() in mandos-client. | 1190 | addrstr, sizeof(addrstr), NULL, 0, | 
| 1191 | NI_NUMERICHOST); | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1192 | } else { | 
| 669
by Teddy Hogeborn Use "struct sockaddr_storage" instead of a union in mandos-client. | 1193 | ret = getnameinfo((struct sockaddr *)&to, | 
| 1194 | sizeof(struct sockaddr_in), | |
| 667
by Teddy Hogeborn Use getnameinfo() instead of inet_ntop() in mandos-client. | 1195 | addrstr, sizeof(addrstr), NULL, 0, | 
| 1196 | NI_NUMERICHOST); | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1197 | } | 
| 667
by Teddy Hogeborn Use getnameinfo() instead of inet_ntop() in mandos-client. | 1198 | if(ret == EAI_SYSTEM){ | 
| 1199 | perror_plus("getnameinfo"); | |
| 1200 | } else if(ret != 0) { | |
| 1201 | fprintf_plus(stderr, "getnameinfo: %s", gai_strerror(ret)); | |
| 1202 | } else if(strcmp(addrstr, ip) != 0){ | |
| 1203 | fprintf_plus(stderr, "Canonical address form: %s\n", addrstr); | |
| 37
by Teddy Hogeborn Non-tested commit for merge purposes. | 1204 | } | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 1205 | } | 
| 13
by Björn Påhlsson Added following support: | 1206 |   
 | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1207 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1208 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1209 | goto mandos_end; | 
| 1210 | } | |
| 1211 |   
 | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1212 | while(true){ | 
| 1213 | if(af == AF_INET6){ | |
| 1214 | ret = connect(tcp_sd, (struct sockaddr *)&to, | |
| 1215 | sizeof(struct sockaddr_in6)); | |
| 1216 | } else { | |
| 1217 | ret = connect(tcp_sd, (struct sockaddr *)&to, /* IPv4 */ | |
| 1218 | sizeof(struct sockaddr_in)); | |
| 1219 | } | |
| 1220 | if(ret < 0){ | |
| 790
by Teddy Hogeborn Bug fix: Add local route also when host is unreachable. | 1221 | if(((errno == ENETUNREACH) or (errno == EHOSTUNREACH)) | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1222 | and if_index != AVAHI_IF_UNSPEC | 
| 1223 | and connect_to == NULL | |
| 1224 | and not route_added and | |
| 1225 | ((af == AF_INET6 and not | |
| 1226 | IN6_IS_ADDR_LINKLOCAL(&(((struct sockaddr_in6 *) | |
| 1227 | &to)->sin6_addr))) | |
| 1228 | or (af == AF_INET and | |
| 1229 | /* Not a a IPv4LL address */ | |
| 1230 | (ntohl(((struct sockaddr_in *)&to)->sin_addr.s_addr) | |
| 1231 | & 0xFFFF0000L) != 0xA9FE0000L))){ | |
| 1232 | /* Work around Avahi bug - Avahi does not announce link-local | |
| 1233 | 	   addresses if it has a global address, so local hosts with
 | |
| 1234 | 	   *only* a link-local address (e.g. Mandos clients) cannot
 | |
| 1235 | 	   connect to a Mandos server announced by Avahi on a server
 | |
| 1236 | 	   host with a global address.  Work around this by retrying
 | |
| 1237 | 	   with an explicit route added with the server's address.
 | |
| 1238 | 	   
 | |
| 1239 | 	   Avahi bug reference:
 | |
| 1240 | 	   http://lists.freedesktop.org/archives/avahi/2010-February/001833.html
 | |
| 1241 | 	   https://bugs.debian.org/587961
 | |
| 1242 | 	*/
 | |
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 1243 | if(debug){ | 
| 1244 | fprintf_plus(stderr, "Mandos server unreachable, trying" | |
| 1245 | " direct route\n"); | |
| 1246 | } | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1247 | int e = errno; | 
| 1248 | route_added = add_local_route(ip, if_index); | |
| 1249 | if(route_added){ | |
| 1250 | continue; | |
| 1251 | } | |
| 1252 | errno = e; | |
| 1253 | } | |
| 1254 | if(errno != ECONNREFUSED or debug){ | |
| 1255 | int e = errno; | |
| 1256 | perror_plus("connect"); | |
| 1257 | errno = e; | |
| 1258 | } | |
| 1259 | goto mandos_end; | |
| 1260 | } | |
| 1261 |     
 | |
| 1262 | if(quit_now){ | |
| 1263 | errno = EINTR; | |
| 1264 | goto mandos_end; | |
| 1265 | } | |
| 1266 | break; | |
| 13
by Björn Påhlsson Added following support: | 1267 | } | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 1268 |   
 | 
| 24.1.12
by Björn Påhlsson merge + | 1269 | const char *out = mandos_protocol_version; | 
| 24.1.10
by Björn Påhlsson merge commit | 1270 | written = 0; | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1271 | while(true){ | 
| 24.1.10
by Björn Påhlsson merge commit | 1272 | size_t out_size = strlen(out); | 
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 1273 | ret = (int)TEMP_FAILURE_RETRY(write(tcp_sd, out + written, | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 1274 | out_size - written)); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1275 | if(ret == -1){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1276 | int e = errno; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1277 | perror_plus("write"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1278 | errno = e; | 
| 24.1.12
by Björn Påhlsson merge + | 1279 | goto mandos_end; | 
| 24.1.10
by Björn Påhlsson merge commit | 1280 | } | 
| 24.1.12
by Björn Påhlsson merge + | 1281 | written += (size_t)ret; | 
| 24.1.10
by Björn Påhlsson merge commit | 1282 | if(written < out_size){ | 
| 1283 | continue; | |
| 1284 | } else { | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1285 | if(out == mandos_protocol_version){ | 
| 24.1.10
by Björn Påhlsson merge commit | 1286 | written = 0; | 
| 1287 | out = "\r\n"; | |
| 1288 | } else { | |
| 1289 | break; | |
| 1290 | } | |
| 1291 | } | |
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1292 |   
 | 
| 1293 | if(quit_now){ | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1294 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1295 | goto mandos_end; | 
| 1296 | } | |
| 24.1.10
by Björn Påhlsson merge commit | 1297 | } | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 1298 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1299 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1300 | fprintf_plus(stderr, "Establishing TLS session with %s\n", ip); | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 1301 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1302 |   
 | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1303 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1304 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1305 | goto mandos_end; | 
| 1306 | } | |
| 1307 |   
 | |
| 588
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Eliminate | 1308 | /* This casting via intptr_t is to eliminate warning about casting | 
| 1309 |      an int to a pointer type.  This is exactly how the GnuTLS Guile
 | |
| 1310 |      function "set-session-transport-fd!" does it. */
 | |
| 1311 | gnutls_transport_set_ptr(session, | |
| 1312 | (gnutls_transport_ptr_t)(intptr_t)tcp_sd); | |
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 1313 |   
 | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1314 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1315 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1316 | goto mandos_end; | 
| 1317 | } | |
| 1318 |   
 | |
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 1319 | do { | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1320 | ret = gnutls_handshake(session); | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1321 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1322 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1323 | goto mandos_end; | 
| 1324 | } | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 1325 | } while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED); | 
| 13
by Björn Påhlsson Added following support: | 1326 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1327 | if(ret != GNUTLS_E_SUCCESS){ | 
| 25
by Teddy Hogeborn * mandos-clients.conf ([DEFAULT]): New section. | 1328 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1329 | fprintf_plus(stderr, "*** GnuTLS Handshake failed ***\n"); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1330 | gnutls_perror(ret); | 
| 25
by Teddy Hogeborn * mandos-clients.conf ([DEFAULT]): New section. | 1331 | } | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1332 | errno = EPROTO; | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1333 | goto mandos_end; | 
| 13
by Björn Påhlsson Added following support: | 1334 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1335 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1336 | /* Read OpenPGP packet that contains the wanted password */ | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1337 |   
 | 
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 1338 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1339 | fprintf_plus(stderr, "Retrieving OpenPGP encrypted password from" | 
| 1340 | " %s\n", ip); | |
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 1341 | } | 
| 143
by Teddy Hogeborn * Makefile (mandos.8): Add dependency on "overview.xml" and | 1342 |   
 | 
| 13
by Björn Påhlsson Added following support: | 1343 | while(true){ | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1344 |     
 | 
| 1345 | if(quit_now){ | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1346 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1347 | goto mandos_end; | 
| 1348 | } | |
| 1349 |     
 | |
| 24.1.132
by Björn Påhlsson Fixed a bug in fallback handling | 1350 | buffer_capacity = incbuffer(&buffer, buffer_length, | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 1351 | buffer_capacity); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1352 | if(buffer_capacity == 0){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1353 | int e = errno; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1354 | perror_plus("incbuffer"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1355 | errno = e; | 
| 24.1.12
by Björn Påhlsson merge + | 1356 | goto mandos_end; | 
| 13
by Björn Påhlsson Added following support: | 1357 | } | 
| 1358 |     
 | |
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1359 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1360 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1361 | goto mandos_end; | 
| 1362 | } | |
| 1363 |     
 | |
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 1364 | sret = gnutls_record_recv(session, buffer+buffer_length, | 
| 1365 | BUFFER_SIZE); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1366 | if(sret == 0){ | 
| 13
by Björn Påhlsson Added following support: | 1367 | break; | 
| 1368 | } | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1369 | if(sret < 0){ | 
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 1370 | switch(sret){ | 
| 13
by Björn Påhlsson Added following support: | 1371 | case GNUTLS_E_INTERRUPTED: | 
| 1372 | case GNUTLS_E_AGAIN: | |
| 1373 | break; | |
| 1374 | case GNUTLS_E_REHANDSHAKE: | |
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 1375 | do { | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1376 | ret = gnutls_handshake(session); | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1377 | 	  
 | 
| 1378 | if(quit_now){ | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1379 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1380 | goto mandos_end; | 
| 1381 | } | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 1382 | } while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1383 | if(ret < 0){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1384 | fprintf_plus(stderr, "*** GnuTLS Re-handshake failed " | 
| 1385 | "***\n"); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1386 | gnutls_perror(ret); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1387 | errno = EPROTO; | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1388 | goto mandos_end; | 
| 13
by Björn Påhlsson Added following support: | 1389 | } | 
| 1390 | break; | |
| 1391 | default: | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1392 | fprintf_plus(stderr, "Unknown error while reading data from" | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1393 | " encrypted session with Mandos server\n"); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1394 | gnutls_bye(session, GNUTLS_SHUT_RDWR); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1395 | errno = EIO; | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1396 | goto mandos_end; | 
| 13
by Björn Påhlsson Added following support: | 1397 | } | 
| 1398 | } else { | |
| 257.1.2
by Mooie Fixed warnings in the 64 bit build. Added explicit cast to int for | 1399 | buffer_length += (size_t) sret; | 
| 13
by Björn Påhlsson Added following support: | 1400 | } | 
| 1401 | } | |
| 15.1.1
by Björn Påhlsson Added debugg support in form off --debug and --debug=mandosclient | 1402 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1403 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1404 | fprintf_plus(stderr, "Closing TLS session\n"); | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1405 | } | 
| 1406 |   
 | |
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1407 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1408 | errno = EINTR; | 
| 371
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Always fail and | 1409 | goto mandos_end; | 
| 1410 | } | |
| 1411 |   
 | |
| 1412 | do { | |
| 1413 | ret = gnutls_bye(session, GNUTLS_SHUT_RDWR); | |
| 1414 | if(quit_now){ | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1415 | errno = EINTR; | 
| 371
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Always fail and | 1416 | goto mandos_end; | 
| 1417 | } | |
| 1418 | } while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED); | |
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1419 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1420 | if(buffer_length > 0){ | 
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 1421 | ssize_t decrypted_buffer_size; | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 1422 | decrypted_buffer_size = pgp_packet_decrypt(buffer, buffer_length, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1423 | &decrypted_buffer, mc); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1424 | if(decrypted_buffer_size >= 0){ | 
| 361
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gpgme): Move variable "ret" into the | 1425 |       
 | 
| 24.1.10
by Björn Påhlsson merge commit | 1426 | written = 0; | 
| 28
by Teddy Hogeborn * server.conf: New file. | 1427 | while(written < (size_t) decrypted_buffer_size){ | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1428 | if(quit_now){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1429 | errno = EINTR; | 
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1430 | goto mandos_end; | 
| 1431 | } | |
| 1432 | 	
 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1433 | ret = (int)fwrite(decrypted_buffer + written, 1, | 
| 1434 | (size_t)decrypted_buffer_size - written, | |
| 1435 | stdout); | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1436 | if(ret == 0 and ferror(stdout)){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1437 | int e = errno; | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1438 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1439 | fprintf_plus(stderr, "Error writing encrypted data: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1440 | strerror(errno)); | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1441 | } | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1442 | errno = e; | 
| 372
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Bug fix: | 1443 | goto mandos_end; | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1444 | } | 
| 22
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to | 1445 | written += (size_t)ret; | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1446 | } | 
| 372
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Bug fix: | 1447 | retval = 0; | 
| 13
by Björn Påhlsson Added following support: | 1448 | } | 
| 1449 | } | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1450 |   
 | 
| 1451 | /* Shutdown procedure */ | |
| 1452 |   
 | |
| 1453 | mandos_end: | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1454 | { | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1455 | if(route_added){ | 
| 738.1.6
by Teddy Hogeborn Fix minor bugs and typos and add some more debug output. | 1456 | if(not delete_local_route(ip, if_index)){ | 
| 1457 | fprintf_plus(stderr, "Failed to delete local route to %s on" | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1458 | " interface %d", ip, if_index); | 
| 1459 | } | |
| 1460 | } | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1461 | int e = errno; | 
| 1462 | free(decrypted_buffer); | |
| 1463 | free(buffer); | |
| 1464 | if(tcp_sd >= 0){ | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 1465 | ret = close(tcp_sd); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1466 | } | 
| 1467 | if(ret == -1){ | |
| 1468 | if(e == 0){ | |
| 1469 | e = errno; | |
| 1470 | } | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1471 | perror_plus("close"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1472 | } | 
| 1473 | gnutls_deinit(session); | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1474 | errno = e; | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1475 | if(quit_now){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1476 | errno = EINTR; | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1477 | retval = -1; | 
| 1478 | } | |
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1479 | } | 
| 13
by Björn Påhlsson Added following support: | 1480 | return retval; | 
| 1481 | }
 | |
| 1482 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1483 | __attribute__((nonnull)) | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 1484 | static void resolve_callback(AvahiSServiceResolver *r, | 
| 1485 | AvahiIfIndex interface, | |
| 304
by Teddy Hogeborn Four new interrelated features: | 1486 | AvahiProtocol proto, | 
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 1487 | AvahiResolverEvent event, | 
| 1488 | const char *name, | |
| 1489 | const char *type, | |
| 1490 | const char *domain, | |
| 1491 | const char *host_name, | |
| 1492 | const AvahiAddress *address, | |
| 1493 | uint16_t port, | |
| 1494 | AVAHI_GCC_UNUSED AvahiStringList *txt, | |
| 1495 | AVAHI_GCC_UNUSED AvahiLookupResultFlags | |
| 1496 | flags, | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1497 | void *mc){ | 
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 1498 | if(r == NULL){ | 
| 1499 | return; | |
| 1500 | } | |
| 22
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to | 1501 |   
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1502 | /* Called whenever a service has been resolved successfully or | 
| 1503 |      timed out */
 | |
| 22
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to | 1504 |   
 | 
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 1505 | if(quit_now){ | 
| 715
by Teddy Hogeborn mandos-client: Bug Fix: Fix some memory leaks. | 1506 | avahi_s_service_resolver_free(r); | 
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 1507 | return; | 
| 1508 | } | |
| 1509 |   
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1510 | switch(event){ | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1511 | default: | 
| 1512 | case AVAHI_RESOLVER_FAILURE: | |
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1513 | fprintf_plus(stderr, "(Avahi Resolver) Failed to resolve service " | 
| 1514 | "'%s' of type '%s' in domain '%s': %s\n", name, type, | |
| 1515 | domain, | |
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1516 | avahi_strerror(avahi_server_errno | 
| 1517 | (((mandos_context*)mc)->server))); | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1518 | break; | 
| 22
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to | 1519 |     
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1520 | case AVAHI_RESOLVER_FOUND: | 
| 1521 | { | |
| 1522 | char ip[AVAHI_ADDRESS_STR_MAX]; | |
| 1523 | avahi_address_snprint(ip, sizeof(ip), address); | |
| 1524 | if(debug){ | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1525 | fprintf_plus(stderr, "Mandos server \"%s\" found on %s (%s, %" | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1526 | PRIdMAX ") on port %" PRIu16 "\n", name, | 
| 1527 | host_name, ip, (intmax_t)interface, port); | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1528 | } | 
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 1529 | int ret = start_mandos_communication(ip, (in_port_t)port, | 
| 1530 | interface, | |
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1531 | avahi_proto_to_af(proto), | 
| 1532 | mc); | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1533 | if(ret == 0){ | 
| 601
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Removed "simple_poll" | 1534 | avahi_simple_poll_quit(simple_poll); | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1535 | } else { | 
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 1536 | if(not add_server(ip, (in_port_t)port, interface, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1537 | avahi_proto_to_af(proto), | 
| 1538 | &((mandos_context*)mc)->current_server)){ | |
| 505.1.27
by teddy at bsnet * plugins.d/mandos-client.c (add_server): Return bool; all callers | 1539 | fprintf_plus(stderr, "Failed to add server \"%s\" to server" | 
| 1540 | " list\n", name); | |
| 1541 | } | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1542 | } | 
| 13
by Björn Påhlsson Added following support: | 1543 | } | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1544 | } | 
| 1545 | avahi_s_service_resolver_free(r); | |
| 13
by Björn Påhlsson Added following support: | 1546 | }
 | 
| 1547 | ||
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1548 | static void browse_callback(AvahiSServiceBrowser *b, | 
| 1549 | AvahiIfIndex interface, | |
| 1550 | AvahiProtocol protocol, | |
| 1551 | AvahiBrowserEvent event, | |
| 1552 | const char *name, | |
| 1553 | const char *type, | |
| 1554 | const char *domain, | |
| 1555 | AVAHI_GCC_UNUSED AvahiLookupResultFlags | |
| 1556 | flags, | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1557 | void *mc){ | 
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 1558 | if(b == NULL){ | 
| 1559 | return; | |
| 1560 | } | |
| 24.1.9
by Björn Påhlsson not working midwork... | 1561 |   
 | 
| 1562 | /* Called whenever a new services becomes available on the LAN or | |
| 1563 |      is removed from the LAN */
 | |
| 1564 |   
 | |
| 358
by Teddy Hogeborn * plugins.d/mandos-client.c (start_mandos_communication): Check | 1565 | if(quit_now){ | 
| 1566 | return; | |
| 1567 | } | |
| 1568 |   
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1569 | switch(event){ | 
| 24.1.9
by Björn Påhlsson not working midwork... | 1570 | default: | 
| 1571 | case AVAHI_BROWSER_FAILURE: | |
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 1572 |     
 | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1573 | fprintf_plus(stderr, "(Avahi browser) %s\n", | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1574 | avahi_strerror(avahi_server_errno | 
| 1575 | (((mandos_context*)mc)->server))); | |
| 601
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Removed "simple_poll" | 1576 | avahi_simple_poll_quit(simple_poll); | 
| 24.1.9
by Björn Påhlsson not working midwork... | 1577 | return; | 
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 1578 |     
 | 
| 24.1.9
by Björn Påhlsson not working midwork... | 1579 | case AVAHI_BROWSER_NEW: | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1580 | /* We ignore the returned Avahi resolver object. In the callback | 
| 1581 |        function we free it. If the Avahi server is terminated before
 | |
| 1582 |        the callback function is called the Avahi server will free the
 | |
| 1583 |        resolver for us. */
 | |
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 1584 |     
 | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1585 | if(avahi_s_service_resolver_new(((mandos_context*)mc)->server, | 
| 1586 | interface, protocol, name, type, | |
| 1587 | domain, protocol, 0, | |
| 1588 | resolve_callback, mc) == NULL) | |
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1589 | fprintf_plus(stderr, "Avahi: Failed to resolve service '%s':" | 
| 1590 | " %s\n", name, | |
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1591 | avahi_strerror(avahi_server_errno | 
| 1592 | (((mandos_context*)mc)->server))); | |
| 24.1.9
by Björn Påhlsson not working midwork... | 1593 | break; | 
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 1594 |     
 | 
| 24.1.9
by Björn Påhlsson not working midwork... | 1595 | case AVAHI_BROWSER_REMOVE: | 
| 1596 | break; | |
| 38
by Teddy Hogeborn * plugbasedclient.c (main): New "--userid" and "--groupid" options. | 1597 |     
 | 
| 24.1.9
by Björn Påhlsson not working midwork... | 1598 | case AVAHI_BROWSER_ALL_FOR_NOW: | 
| 1599 | case AVAHI_BROWSER_CACHE_EXHAUSTED: | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1600 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1601 | fprintf_plus(stderr, "No Mandos server found, still" | 
| 1602 | " searching...\n"); | |
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 1603 | } | 
| 24.1.9
by Björn Påhlsson not working midwork... | 1604 | break; | 
| 1605 | } | |
| 13
by Björn Påhlsson Added following support: | 1606 | }
 | 
| 1607 | ||
| 485
by Teddy Hogeborn Merge from Björn. | 1608 | /* Signal handler that stops main loop after SIGTERM */
 | 
| 354
by Teddy Hogeborn * plugins.d/mandos-client.c (signal_received): New. | 1609 | static void handle_sigterm(int sig){ | 
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 1610 | if(quit_now){ | 
| 1611 | return; | |
| 1612 | } | |
| 1613 | quit_now = 1; | |
| 354
by Teddy Hogeborn * plugins.d/mandos-client.c (signal_received): New. | 1614 | signal_received = sig; | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 1615 | int old_errno = errno; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1616 | /* set main loop to exit */ | 
| 601
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Removed "simple_poll" | 1617 | if(simple_poll != NULL){ | 
| 1618 | avahi_simple_poll_quit(simple_poll); | |
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 1619 | } | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 1620 | errno = old_errno; | 
| 1621 | }
 | |
| 1622 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1623 | __attribute__((nonnull, warn_unused_result)) | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1624 | bool get_flags(const char *ifname, struct ifreq *ifr){ | 
| 505.2.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1625 | int ret; | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 1626 | int old_errno; | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1627 |   
 | 
| 505.2.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1628 | int s = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP); | 
| 1629 | if(s < 0){ | |
| 819
by Teddy Hogeborn errno is of type int, not error_t | 1630 | old_errno = errno; | 
| 505.2.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1631 | perror_plus("socket"); | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 1632 | errno = old_errno; | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1633 | return false; | 
| 505.2.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1634 | } | 
| 798
by Teddy Hogeborn plugins.d/mandos-client.c (get_flags): Use strncpy(), not strcpy(). | 1635 | strncpy(ifr->ifr_name, ifname, IF_NAMESIZE); | 
| 1636 | ifr->ifr_name[IF_NAMESIZE-1] = '\0'; /* NUL terminate */ | |
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1637 | ret = ioctl(s, SIOCGIFFLAGS, ifr); | 
| 505.2.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1638 | if(ret == -1){ | 
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1639 | if(debug){ | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 1640 | old_errno = errno; | 
| 505.2.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1641 | perror_plus("ioctl SIOCGIFFLAGS"); | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 1642 | errno = old_errno; | 
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1643 | } | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1644 | return false; | 
| 237.2.33
by teddy at bsnet * plugins.d/mandos-client.c: An empty interface name now means to | 1645 | } | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1646 | return true; | 
| 1647 | }
 | |
| 1648 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1649 | __attribute__((nonnull, warn_unused_result)) | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1650 | bool good_flags(const char *ifname, const struct ifreq *ifr){ | 
| 1651 |   
 | |
| 237.2.33
by teddy at bsnet * plugins.d/mandos-client.c: An empty interface name now means to | 1652 | /* Reject the loopback device */ | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1653 | if(ifr->ifr_flags & IFF_LOOPBACK){ | 
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1654 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1655 | fprintf_plus(stderr, "Rejecting loopback interface \"%s\"\n", | 
| 1656 | ifname); | |
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1657 | } | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1658 | return false; | 
| 237.2.33
by teddy at bsnet * plugins.d/mandos-client.c: An empty interface name now means to | 1659 | } | 
| 1660 | /* Accept point-to-point devices only if connect_to is specified */ | |
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1661 | if(connect_to != NULL and (ifr->ifr_flags & IFF_POINTOPOINT)){ | 
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1662 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1663 | fprintf_plus(stderr, "Accepting point-to-point interface" | 
| 1664 | " \"%s\"\n", ifname); | |
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1665 | } | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1666 | return true; | 
| 237.2.33
by teddy at bsnet * plugins.d/mandos-client.c: An empty interface name now means to | 1667 | } | 
| 1668 | /* Otherwise, reject non-broadcast-capable devices */ | |
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1669 | if(not (ifr->ifr_flags & IFF_BROADCAST)){ | 
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1670 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1671 | fprintf_plus(stderr, "Rejecting non-broadcast interface" | 
| 1672 | " \"%s\"\n", ifname); | |
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1673 | } | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1674 | return false; | 
| 237.2.33
by teddy at bsnet * plugins.d/mandos-client.c: An empty interface name now means to | 1675 | } | 
| 481
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Reject non-ARP | 1676 | /* Reject non-ARP interfaces (including dummy interfaces) */ | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1677 | if(ifr->ifr_flags & IFF_NOARP){ | 
| 481
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Reject non-ARP | 1678 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1679 | fprintf_plus(stderr, "Rejecting non-ARP interface \"%s\"\n", | 
| 1680 | ifname); | |
| 481
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Reject non-ARP | 1681 | } | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1682 | return false; | 
| 481
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Reject non-ARP | 1683 | } | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1684 |   
 | 
| 237.2.33
by teddy at bsnet * plugins.d/mandos-client.c: An empty interface name now means to | 1685 | /* Accept this device */ | 
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1686 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1687 | fprintf_plus(stderr, "Interface \"%s\" is good\n", ifname); | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1688 | } | 
| 1689 | return true; | |
| 1690 | }
 | |
| 1691 | ||
| 1692 | /* 
 | |
| 1693 |  * This function determines if a directory entry in /sys/class/net
 | |
| 1694 |  * corresponds to an acceptable network device.
 | |
| 1695 |  * (This function is passed to scandir(3) as a filter function.)
 | |
| 1696 |  */
 | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1697 | __attribute__((nonnull, warn_unused_result)) | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1698 | int good_interface(const struct dirent *if_entry){ | 
| 1699 | if(if_entry->d_name[0] == '.'){ | |
| 1700 | return 0; | |
| 1701 | } | |
| 505.3.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Add error message. | 1702 |   
 | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1703 | struct ifreq ifr; | 
| 1704 | if(not get_flags(if_entry->d_name, &ifr)){ | |
| 505.3.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Add error message. | 1705 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1706 | fprintf_plus(stderr, "Failed to get flags for interface " | 
| 1707 | "\"%s\"\n", if_entry->d_name); | |
| 505.3.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Add error message. | 1708 | } | 
| 505.2.2
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead | 1709 | return 0; | 
| 1710 | } | |
| 1711 |   
 | |
| 1712 | if(not good_flags(if_entry->d_name, &ifr)){ | |
| 1713 | return 0; | |
| 237.2.34
by teddy at bsnet * plugins.d/mandos-client.c: Added debug output. | 1714 | } | 
| 237.2.33
by teddy at bsnet * plugins.d/mandos-client.c: An empty interface name now means to | 1715 | return 1; | 
| 1716 | }
 | |
| 1717 | ||
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 1718 | /* 
 | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 1719 |  * This function determines if a network interface is up.
 | 
| 1720 |  */
 | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1721 | __attribute__((nonnull, warn_unused_result)) | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 1722 | bool interface_is_up(const char *interface){ | 
| 1723 | struct ifreq ifr; | |
| 1724 | if(not get_flags(interface, &ifr)){ | |
| 1725 | if(debug){ | |
| 1726 | fprintf_plus(stderr, "Failed to get flags for interface " | |
| 1727 | "\"%s\"\n", interface); | |
| 1728 | } | |
| 1729 | return false; | |
| 1730 | } | |
| 1731 |   
 | |
| 1732 | return (bool)(ifr.ifr_flags & IFF_UP); | |
| 1733 | }
 | |
| 1734 | ||
| 1735 | /* 
 | |
| 1736 |  * This function determines if a network interface is running
 | |
| 1737 |  */
 | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1738 | __attribute__((nonnull, warn_unused_result)) | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 1739 | bool interface_is_running(const char *interface){ | 
| 1740 | struct ifreq ifr; | |
| 1741 | if(not get_flags(interface, &ifr)){ | |
| 1742 | if(debug){ | |
| 1743 | fprintf_plus(stderr, "Failed to get flags for interface " | |
| 1744 | "\"%s\"\n", interface); | |
| 1745 | } | |
| 1746 | return false; | |
| 1747 | } | |
| 1748 |   
 | |
| 1749 | return (bool)(ifr.ifr_flags & IFF_RUNNING); | |
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 1750 | }
 | 
| 1751 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1752 | __attribute__((nonnull, pure, warn_unused_result)) | 
| 24.1.172
by Björn Påhlsson using scandir instead of readdir | 1753 | int notdotentries(const struct dirent *direntry){ | 
| 1754 | /* Skip "." and ".." */ | |
| 1755 | if(direntry->d_name[0] == '.' | |
| 1756 | and (direntry->d_name[1] == '\0' | |
| 1757 | or (direntry->d_name[1] == '.' | |
| 1758 | and direntry->d_name[2] == '\0'))){ | |
| 1759 | return 0; | |
| 1760 | } | |
| 1761 | return 1; | |
| 1762 | }
 | |
| 1763 | ||
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 1764 | /* Is this directory entry a runnable program? */
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1765 | __attribute__((nonnull, warn_unused_result)) | 
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 1766 | int runnable_hook(const struct dirent *direntry){ | 
| 1767 | int ret; | |
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 1768 | size_t sret; | 
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 1769 | struct stat st; | 
| 1770 |   
 | |
| 1771 | if((direntry->d_name)[0] == '\0'){ | |
| 1772 | /* Empty name? */ | |
| 1773 | return 0; | |
| 1774 | } | |
| 1775 |   
 | |
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 1776 | sret = strspn(direntry->d_name, "ABCDEFGHIJKLMNOPQRSTUVWXYZ" | 
| 1777 | "abcdefghijklmnopqrstuvwxyz" | |
| 1778 | "0123456789" | |
| 688
by Teddy Hogeborn Minor bug fix in mandos-client: Allow periods in network hook names. | 1779 | "_.-"); | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 1780 | if((direntry->d_name)[sret] != '\0'){ | 
| 1781 | /* Contains non-allowed characters */ | |
| 1782 | if(debug){ | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1783 | fprintf_plus(stderr, "Ignoring hook \"%s\" with bad name\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1784 | direntry->d_name); | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 1785 | } | 
| 1786 | return 0; | |
| 1787 | } | |
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 1788 |   
 | 
| 693
by Teddy Hogeborn Make mandos-client use fstatat(). | 1789 | ret = fstatat(hookdir_fd, direntry->d_name, &st, 0); | 
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 1790 | if(ret == -1){ | 
| 1791 | if(debug){ | |
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 1792 | perror_plus("Could not stat hook"); | 
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 1793 | } | 
| 1794 | return 0; | |
| 1795 | } | |
| 505.3.1
by teddy at bsnet * plugins.d/mandos-client.c (good_interface): Add error message. | 1796 | if(not (S_ISREG(st.st_mode))){ | 
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 1797 | /* Not a regular file */ | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 1798 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1799 | fprintf_plus(stderr, "Ignoring hook \"%s\" - not a file\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1800 | direntry->d_name); | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 1801 | } | 
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 1802 | return 0; | 
| 1803 | } | |
| 1804 | if(not (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))){ | |
| 1805 | /* Not executable */ | |
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 1806 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 1807 | fprintf_plus(stderr, "Ignoring hook \"%s\" - not executable\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1808 | direntry->d_name); | 
| 505.3.6
by teddy at bsnet * plugins.d/mandos-client.c: Some white space fixes. | 1809 | } | 
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 1810 | return 0; | 
| 1811 | } | |
| 505.3.12
by Teddy Hogeborn * plugins.d/mandos-client.c (runnable_hook): Add debug output. | 1812 | if(debug){ | 
| 1813 | fprintf_plus(stderr, "Hook \"%s\" is acceptable\n", | |
| 1814 | direntry->d_name); | |
| 1815 | } | |
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 1816 | return 1; | 
| 1817 | }
 | |
| 1818 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1819 | __attribute__((nonnull, warn_unused_result)) | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1820 | int avahi_loop_with_timeout(AvahiSimplePoll *s, int retry_interval, | 
| 1821 | mandos_context *mc){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1822 | int ret; | 
| 1823 | struct timespec now; | |
| 1824 | struct timespec waited_time; | |
| 1825 | intmax_t block_time; | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 1826 |   
 | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1827 | while(true){ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1828 | if(mc->current_server == NULL){ | 
| 671
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 1829 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1830 | fprintf_plus(stderr, "Wait until first server is found." | 
| 1831 | " No timeout!\n"); | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1832 | } | 
| 1833 | ret = avahi_simple_poll_iterate(s, -1); | |
| 1834 | } else { | |
| 671
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 1835 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1836 | fprintf_plus(stderr, "Check current_server if we should run" | 
| 1837 | " it, or wait\n"); | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1838 | } | 
| 1839 | /* the current time */ | |
| 1840 | ret = clock_gettime(CLOCK_MONOTONIC, &now); | |
| 1841 | if(ret == -1){ | |
| 1842 | perror_plus("clock_gettime"); | |
| 1843 | return -1; | |
| 1844 | } | |
| 1845 | /* Calculating in ms how long time between now and server | |
| 1846 | 	 who we visted longest time ago. Now - last seen.  */
 | |
| 485
by Teddy Hogeborn Merge from Björn. | 1847 | waited_time.tv_sec = (now.tv_sec | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1848 | - mc->current_server->last_seen.tv_sec); | 
| 485
by Teddy Hogeborn Merge from Björn. | 1849 | waited_time.tv_nsec = (now.tv_nsec | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1850 | - mc->current_server->last_seen.tv_nsec); | 
| 485
by Teddy Hogeborn Merge from Björn. | 1851 | /* total time is 10s/10,000ms. | 
| 1852 | 	 Converting to s from ms by dividing by 1,000,
 | |
| 1853 | 	 and ns to ms by dividing by 1,000,000. */
 | |
| 1854 | block_time = ((retry_interval | |
| 1855 | - ((intmax_t)waited_time.tv_sec * 1000)) | |
| 1856 | - ((intmax_t)waited_time.tv_nsec / 1000000)); | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 1857 |       
 | 
| 671
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 1858 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 1859 | fprintf_plus(stderr, "Blocking for %" PRIdMAX " ms\n", | 
| 1860 | block_time); | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1861 | } | 
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 1862 |       
 | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1863 | if(block_time <= 0){ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1864 | ret = start_mandos_communication(mc->current_server->ip, | 
| 1865 | mc->current_server->port, | |
| 1866 | mc->current_server->if_index, | |
| 1867 | mc->current_server->af, mc); | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1868 | if(ret == 0){ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1869 | avahi_simple_poll_quit(s); | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1870 | return 0; | 
| 1871 | } | |
| 485
by Teddy Hogeborn Merge from Björn. | 1872 | ret = clock_gettime(CLOCK_MONOTONIC, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1873 | &mc->current_server->last_seen); | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1874 | if(ret == -1){ | 
| 1875 | perror_plus("clock_gettime"); | |
| 1876 | return -1; | |
| 1877 | } | |
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 1878 | mc->current_server = mc->current_server->next; | 
| 485
by Teddy Hogeborn Merge from Björn. | 1879 | block_time = 0; /* Call avahi to find new Mandos | 
| 1880 | 				   servers, but don't block */
 | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1881 | } | 
| 1882 |       
 | |
| 1883 | ret = avahi_simple_poll_iterate(s, (int)block_time); | |
| 1884 | } | |
| 1885 | if(ret != 0){ | |
| 671
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 1886 | if(ret > 0 or errno != EINTR){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 1887 | return (ret != 1) ? ret : 0; | 
| 1888 | } | |
| 1889 | } | |
| 1890 | } | |
| 1891 | }
 | |
| 1892 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 1893 | __attribute__((nonnull)) | 
| 1894 | void run_network_hooks(const char *mode, const char *interface, | |
| 505.3.8
by Teddy Hogeborn * plugins.d/mandos-client.c (run_network_hooks): New. | 1895 | const float delay){ | 
| 704
by Teddy Hogeborn mandos-client: Fix some bugs on error conditions. | 1896 | struct dirent **direntries = NULL; | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 1897 | if(hookdir_fd == -1){ | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1898 | hookdir_fd = open(hookdir, O_RDONLY | O_DIRECTORY | O_PATH | 
| 1899 | | O_CLOEXEC); | |
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 1900 | if(hookdir_fd == -1){ | 
| 1901 | if(errno == ENOENT){ | |
| 1902 | if(debug){ | |
| 1903 | fprintf_plus(stderr, "Network hook directory \"%s\" not" | |
| 1904 | " found\n", hookdir); | |
| 1905 | } | |
| 1906 | } else { | |
| 1907 | perror_plus("open"); | |
| 1908 | } | |
| 1909 | return; | |
| 1910 | } | |
| 1911 | } | |
| 1912 | int numhooks = scandirat(hookdir_fd, ".", &direntries, | |
| 1913 | runnable_hook, alphasort); | |
| 505.3.8
by Teddy Hogeborn * plugins.d/mandos-client.c (run_network_hooks): New. | 1914 | if(numhooks == -1){ | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 1915 | perror_plus("scandir"); | 
| 1916 | return; | |
| 1917 | } | |
| 1918 | struct dirent *direntry; | |
| 1919 | int ret; | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 1920 | int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY)); | 
| 1921 | if(devnull == -1){ | |
| 1922 | perror_plus("open(\"/dev/null\", O_RDONLY)"); | |
| 1923 | return; | |
| 1924 | } | |
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 1925 | for(int i = 0; i < numhooks; i++){ | 
| 1926 | direntry = direntries[i]; | |
| 1927 | if(debug){ | |
| 1928 | fprintf_plus(stderr, "Running network hook \"%s\"\n", | |
| 1929 | direntry->d_name); | |
| 1930 | } | |
| 1931 | pid_t hook_pid = fork(); | |
| 1932 | if(hook_pid == 0){ | |
| 1933 | /* Child */ | |
| 1934 | /* Raise privileges */ | |
| 706
by Teddy Hogeborn mandos-client: Better error messages. | 1935 | errno = raise_privileges_permanently(); | 
| 1936 | if(errno != 0){ | |
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 1937 | perror_plus("Failed to raise privileges"); | 
| 1938 | _exit(EX_NOPERM); | |
| 1939 | } | |
| 1940 | /* Set group */ | |
| 1941 | errno = 0; | |
| 1942 | ret = setgid(0); | |
| 1943 | if(ret == -1){ | |
| 1944 | perror_plus("setgid"); | |
| 1945 | _exit(EX_NOPERM); | |
| 1946 | } | |
| 1947 | /* Reset supplementary groups */ | |
| 1948 | errno = 0; | |
| 1949 | ret = setgroups(0, NULL); | |
| 1950 | if(ret == -1){ | |
| 1951 | perror_plus("setgroups"); | |
| 1952 | _exit(EX_NOPERM); | |
| 1953 | } | |
| 1954 | ret = setenv("MANDOSNETHOOKDIR", hookdir, 1); | |
| 1955 | if(ret == -1){ | |
| 1956 | perror_plus("setenv"); | |
| 1957 | _exit(EX_OSERR); | |
| 1958 | } | |
| 1959 | ret = setenv("DEVICE", interface, 1); | |
| 1960 | if(ret == -1){ | |
| 1961 | perror_plus("setenv"); | |
| 1962 | _exit(EX_OSERR); | |
| 1963 | } | |
| 1964 | ret = setenv("VERBOSITY", debug ? "1" : "0", 1); | |
| 1965 | if(ret == -1){ | |
| 1966 | perror_plus("setenv"); | |
| 1967 | _exit(EX_OSERR); | |
| 1968 | } | |
| 1969 | ret = setenv("MODE", mode, 1); | |
| 1970 | if(ret == -1){ | |
| 1971 | perror_plus("setenv"); | |
| 1972 | _exit(EX_OSERR); | |
| 1973 | } | |
| 1974 | char *delaystring; | |
| 1975 | ret = asprintf(&delaystring, "%f", (double)delay); | |
| 1976 | if(ret == -1){ | |
| 505.3.8
by Teddy Hogeborn * plugins.d/mandos-client.c (run_network_hooks): New. | 1977 | perror_plus("asprintf"); | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 1978 | _exit(EX_OSERR); | 
| 1979 | } | |
| 1980 | ret = setenv("DELAY", delaystring, 1); | |
| 1981 | if(ret == -1){ | |
| 505.3.8
by Teddy Hogeborn * plugins.d/mandos-client.c (run_network_hooks): New. | 1982 | free(delaystring); | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 1983 | perror_plus("setenv"); | 
| 1984 | _exit(EX_OSERR); | |
| 1985 | } | |
| 1986 | free(delaystring); | |
| 1987 | if(connect_to != NULL){ | |
| 1988 | ret = setenv("CONNECT", connect_to, 1); | |
| 1989 | if(ret == -1){ | |
| 1990 | perror_plus("setenv"); | |
| 1991 | _exit(EX_OSERR); | |
| 1992 | } | |
| 1993 | } | |
| 738.1.3
by Teddy Hogeborn mandos-client: Minor changes to check for more error conditions. | 1994 | int hook_fd = (int)TEMP_FAILURE_RETRY(openat(hookdir_fd, | 
| 1995 | direntry->d_name, | |
| 1996 | O_RDONLY)); | |
| 696
by Teddy Hogeborn Bug fix for mandos-client: Run the network hook, not the directory. | 1997 | if(hook_fd == -1){ | 
| 1998 | perror_plus("openat"); | |
| 1999 | _exit(EXIT_FAILURE); | |
| 2000 | } | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2001 | if(close(hookdir_fd) == -1){ | 
| 696
by Teddy Hogeborn Bug fix for mandos-client: Run the network hook, not the directory. | 2002 | perror_plus("close"); | 
| 2003 | _exit(EXIT_FAILURE); | |
| 2004 | } | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 2005 | ret = dup2(devnull, STDIN_FILENO); | 
| 2006 | if(ret == -1){ | |
| 2007 | perror_plus("dup2(devnull, STDIN_FILENO)"); | |
| 2008 | _exit(EX_OSERR); | |
| 2009 | } | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2010 | ret = close(devnull); | 
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 2011 | if(ret == -1){ | 
| 2012 | perror_plus("close"); | |
| 2013 | _exit(EX_OSERR); | |
| 2014 | } | |
| 2015 | ret = dup2(STDERR_FILENO, STDOUT_FILENO); | |
| 2016 | if(ret == -1){ | |
| 2017 | perror_plus("dup2(STDERR_FILENO, STDOUT_FILENO)"); | |
| 2018 | _exit(EX_OSERR); | |
| 2019 | } | |
| 696
by Teddy Hogeborn Bug fix for mandos-client: Run the network hook, not the directory. | 2020 | if(fexecve(hook_fd, (char *const []){ direntry->d_name, NULL }, | 
| 2021 | environ) == -1){ | |
| 692
by Teddy Hogeborn Make mandos-client use fexecve(). | 2022 | perror_plus("fexecve"); | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2023 | _exit(EXIT_FAILURE); | 
| 2024 | } | |
| 2025 | } else { | |
| 733
by Teddy Hogeborn mandos-client: Bug fix: Check fork() return value. | 2026 | if(hook_pid == -1){ | 
| 2027 | perror_plus("fork"); | |
| 2028 | free(direntry); | |
| 2029 | continue; | |
| 2030 | } | |
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2031 | int status; | 
| 2032 | if(TEMP_FAILURE_RETRY(waitpid(hook_pid, &status, 0)) == -1){ | |
| 2033 | perror_plus("waitpid"); | |
| 715
by Teddy Hogeborn mandos-client: Bug Fix: Fix some memory leaks. | 2034 | free(direntry); | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2035 | continue; | 
| 2036 | } | |
| 2037 | if(WIFEXITED(status)){ | |
| 2038 | if(WEXITSTATUS(status) != 0){ | |
| 2039 | fprintf_plus(stderr, "Warning: network hook \"%s\" exited" | |
| 2040 | " with status %d\n", direntry->d_name, | |
| 2041 | WEXITSTATUS(status)); | |
| 715
by Teddy Hogeborn mandos-client: Bug Fix: Fix some memory leaks. | 2042 | free(direntry); | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2043 | continue; | 
| 2044 | } | |
| 2045 | } else if(WIFSIGNALED(status)){ | |
| 2046 | fprintf_plus(stderr, "Warning: network hook \"%s\" died by" | |
| 2047 | " signal %d\n", direntry->d_name, | |
| 2048 | WTERMSIG(status)); | |
| 715
by Teddy Hogeborn mandos-client: Bug Fix: Fix some memory leaks. | 2049 | free(direntry); | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2050 | continue; | 
| 505.3.8
by Teddy Hogeborn * plugins.d/mandos-client.c (run_network_hooks): New. | 2051 | } else { | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2052 | fprintf_plus(stderr, "Warning: network hook \"%s\"" | 
| 2053 | " crashed\n", direntry->d_name); | |
| 715
by Teddy Hogeborn mandos-client: Bug Fix: Fix some memory leaks. | 2054 | free(direntry); | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2055 | continue; | 
| 2056 | } | |
| 2057 | } | |
| 2058 | if(debug){ | |
| 2059 | fprintf_plus(stderr, "Network hook \"%s\" ran successfully\n", | |
| 2060 | direntry->d_name); | |
| 2061 | } | |
| 715
by Teddy Hogeborn mandos-client: Bug Fix: Fix some memory leaks. | 2062 | free(direntry); | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2063 | } | 
| 704
by Teddy Hogeborn mandos-client: Fix some bugs on error conditions. | 2064 | free(direntries); | 
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2065 | if(close(hookdir_fd) == -1){ | 
| 691
by Teddy Hogeborn Make mandos-client use scandirat() if it exists. | 2066 | perror_plus("close"); | 
| 2067 | } else { | |
| 2068 | hookdir_fd = -1; | |
| 2069 | } | |
| 2070 | close(devnull); | |
| 505.3.8
by Teddy Hogeborn * plugins.d/mandos-client.c (run_network_hooks): New. | 2071 | }
 | 
| 2072 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2073 | __attribute__((nonnull, warn_unused_result)) | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2074 | int bring_up_interface(const char *const interface, | 
| 2075 | const float delay){ | |
| 2076 | int old_errno = errno; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2077 | int ret; | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2078 | struct ifreq network; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2079 | unsigned int if_index = if_nametoindex(interface); | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2080 | if(if_index == 0){ | 
| 2081 | fprintf_plus(stderr, "No such interface: \"%s\"\n", interface); | |
| 594.1.2
by Teddy Hogeborn * plugins.d/mandos-client.c (bring_up_interface): Bug fix: Return | 2082 | errno = old_errno; | 
| 2083 | return ENXIO; | |
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2084 | } | 
| 2085 |   
 | |
| 2086 | if(quit_now){ | |
| 594.1.2
by Teddy Hogeborn * plugins.d/mandos-client.c (bring_up_interface): Bug fix: Return | 2087 | errno = old_errno; | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2088 | return EINTR; | 
| 2089 | } | |
| 2090 |   
 | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2091 | if(not interface_is_up(interface)){ | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2092 | int ret_errno = 0; | 
| 2093 | int ioctl_errno = 0; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2094 | if(not get_flags(interface, &network)){ | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2095 | ret_errno = errno; | 
| 2096 | fprintf_plus(stderr, "Failed to get flags for interface " | |
| 2097 | "\"%s\"\n", interface); | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2098 | errno = old_errno; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2099 | return ret_errno; | 
| 2100 | } | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2101 | network.ifr_flags |= IFF_UP; /* set flag */ | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2102 |     
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2103 | int sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP); | 
| 2104 | if(sd == -1){ | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2105 | ret_errno = errno; | 
| 2106 | perror_plus("socket"); | |
| 2107 | errno = old_errno; | |
| 2108 | return ret_errno; | |
| 2109 | } | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2110 |     
 | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2111 | if(quit_now){ | 
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2112 | ret = close(sd); | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2113 | if(ret == -1){ | 
| 2114 | perror_plus("close"); | |
| 2115 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2116 | errno = old_errno; | 
| 2117 | return EINTR; | |
| 2118 | } | |
| 2119 |     
 | |
| 2120 | if(debug){ | |
| 2121 | fprintf_plus(stderr, "Bringing up interface \"%s\"\n", | |
| 2122 | interface); | |
| 2123 | } | |
| 2124 |     
 | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2125 | /* Raise privileges */ | 
| 2126 | ret_errno = raise_privileges(); | |
| 680
by Teddy Hogeborn Minor changes to minimize diff from last release. | 2127 | if(ret_errno != 0){ | 
| 706
by Teddy Hogeborn mandos-client: Better error messages. | 2128 | errno = ret_errno; | 
| 680
by Teddy Hogeborn Minor changes to minimize diff from last release. | 2129 | perror_plus("Failed to raise privileges"); | 
| 2130 | } | |
| 2131 |     
 | |
| 2132 | #ifdef __linux__
 | |
| 2133 | int ret_linux; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2134 | bool restore_loglevel = false; | 
| 2135 | if(ret_errno == 0){ | |
| 2136 | /* Lower kernel loglevel to KERN_NOTICE to avoid KERN_INFO | |
| 2137 | 	 messages about the network interface to mess up the prompt */
 | |
| 2138 | ret_linux = klogctl(8, NULL, 5); | |
| 2139 | if(ret_linux == -1){ | |
| 2140 | perror_plus("klogctl"); | |
| 2141 | } else { | |
| 2142 | restore_loglevel = true; | |
| 2143 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2144 | } | 
| 2145 | #endif /* __linux__ */ | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2146 | int ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network); | 
| 2147 | ioctl_errno = errno; | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2148 | #ifdef __linux__
 | 
| 2149 | if(restore_loglevel){ | |
| 2150 | ret_linux = klogctl(7, NULL, 0); | |
| 2151 | if(ret_linux == -1){ | |
| 2152 | perror_plus("klogctl"); | |
| 2153 | } | |
| 2154 | } | |
| 2155 | #endif /* __linux__ */ | |
| 2156 |     
 | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2157 | /* If raise_privileges() succeeded above */ | 
| 2158 | if(ret_errno == 0){ | |
| 2159 | /* Lower privileges */ | |
| 2160 | ret_errno = lower_privileges(); | |
| 2161 | if(ret_errno != 0){ | |
| 2162 | errno = ret_errno; | |
| 2163 | perror_plus("Failed to lower privileges"); | |
| 2164 | } | |
| 2165 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2166 |     
 | 
| 2167 | /* Close the socket */ | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2168 | ret = close(sd); | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2169 | if(ret == -1){ | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2170 | perror_plus("close"); | 
| 2171 | } | |
| 2172 |     
 | |
| 2173 | if(ret_setflags == -1){ | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2174 | errno = ioctl_errno; | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2175 | perror_plus("ioctl SIOCSIFFLAGS +IFF_UP"); | 
| 594.1.2
by Teddy Hogeborn * plugins.d/mandos-client.c (bring_up_interface): Bug fix: Return | 2176 | errno = old_errno; | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2177 | return ioctl_errno; | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2178 | } | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2179 | } else if(debug){ | 
| 2180 | fprintf_plus(stderr, "Interface \"%s\" is already up; good\n", | |
| 2181 | interface); | |
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2182 | } | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2183 |   
 | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2184 | /* Sleep checking until interface is running. | 
| 2185 |      Check every 0.25s, up to total time of delay */
 | |
| 2186 | for(int i=0; i < delay * 4; i++){ | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2187 | if(interface_is_running(interface)){ | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2188 | break; | 
| 2189 | } | |
| 2190 | struct timespec sleeptime = { .tv_nsec = 250000000 }; | |
| 2191 | ret = nanosleep(&sleeptime, NULL); | |
| 2192 | if(ret == -1 and errno != EINTR){ | |
| 2193 | perror_plus("nanosleep"); | |
| 2194 | } | |
| 2195 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2196 |   
 | 
| 2197 | errno = old_errno; | |
| 2198 | return 0; | |
| 2199 | }
 | |
| 2200 | ||
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2201 | __attribute__((nonnull, warn_unused_result)) | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2202 | int take_down_interface(const char *const interface){ | 
| 2203 | int old_errno = errno; | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2204 | struct ifreq network; | 
| 2205 | unsigned int if_index = if_nametoindex(interface); | |
| 2206 | if(if_index == 0){ | |
| 2207 | fprintf_plus(stderr, "No such interface: \"%s\"\n", interface); | |
| 2208 | errno = old_errno; | |
| 2209 | return ENXIO; | |
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2210 | } | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2211 | if(interface_is_up(interface)){ | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2212 | int ret_errno = 0; | 
| 2213 | int ioctl_errno = 0; | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2214 | if(not get_flags(interface, &network) and debug){ | 
| 2215 | ret_errno = errno; | |
| 2216 | fprintf_plus(stderr, "Failed to get flags for interface " | |
| 2217 | "\"%s\"\n", interface); | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2218 | errno = old_errno; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2219 | return ret_errno; | 
| 2220 | } | |
| 2221 | network.ifr_flags &= ~(short)IFF_UP; /* clear flag */ | |
| 2222 |     
 | |
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 2223 | int sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP); | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2224 | if(sd == -1){ | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2225 | ret_errno = errno; | 
| 2226 | perror_plus("socket"); | |
| 2227 | errno = old_errno; | |
| 2228 | return ret_errno; | |
| 2229 | } | |
| 2230 |     
 | |
| 2231 | if(debug){ | |
| 2232 | fprintf_plus(stderr, "Taking down interface \"%s\"\n", | |
| 2233 | interface); | |
| 2234 | } | |
| 2235 |     
 | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2236 | /* Raise privileges */ | 
| 2237 | ret_errno = raise_privileges(); | |
| 2238 | if(ret_errno != 0){ | |
| 706
by Teddy Hogeborn mandos-client: Better error messages. | 2239 | errno = ret_errno; | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2240 | perror_plus("Failed to raise privileges"); | 
| 2241 | } | |
| 680
by Teddy Hogeborn Minor changes to minimize diff from last release. | 2242 |     
 | 
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 2243 | int ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network); | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2244 | ioctl_errno = errno; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2245 |     
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2246 | /* If raise_privileges() succeeded above */ | 
| 2247 | if(ret_errno == 0){ | |
| 2248 | /* Lower privileges */ | |
| 2249 | ret_errno = lower_privileges(); | |
| 2250 | if(ret_errno != 0){ | |
| 2251 | errno = ret_errno; | |
| 2252 | perror_plus("Failed to lower privileges"); | |
| 2253 | } | |
| 2254 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2255 |     
 | 
| 2256 | /* Close the socket */ | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2257 | int ret = close(sd); | 
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2258 | if(ret == -1){ | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2259 | perror_plus("close"); | 
| 2260 | } | |
| 2261 |     
 | |
| 2262 | if(ret_setflags == -1){ | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2263 | errno = ioctl_errno; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2264 | perror_plus("ioctl SIOCSIFFLAGS -IFF_UP"); | 
| 2265 | errno = old_errno; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2266 | return ioctl_errno; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2267 | } | 
| 2268 | } else if(debug){ | |
| 2269 | fprintf_plus(stderr, "Interface \"%s\" is already down; odd\n", | |
| 2270 | interface); | |
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2271 | } | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2272 |   
 | 
| 594.1.2
by Teddy Hogeborn * plugins.d/mandos-client.c (bring_up_interface): Bug fix: Return | 2273 | errno = old_errno; | 
| 2274 | return 0; | |
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2275 | }
 | 
| 2276 | ||
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 2277 | int main(int argc, char *argv[]){ | 
| 743
by Teddy Hogeborn Automatically determine the number of DH bits in the TLS handshake. | 2278 | mandos_context mc = { .server = NULL, .dh_bits = 0, | 
| 777
by Teddy Hogeborn Bug fix for GnuTLS 3: be compatible with old 2048-bit DSA keys. | 2279 | .priority = "SECURE256:!CTYPE-X.509" | 
| 2280 | ":+CTYPE-OPENPGP:!RSA:+SIGN-DSA-SHA256", | |
| 2281 | .current_server = NULL, .interfaces = NULL, | |
| 2282 | .interfaces_size = 0 }; | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2283 | AvahiSServiceBrowser *sb = NULL; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2284 | error_t ret_errno; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2285 | int ret; | 
| 2286 | intmax_t tmpmax; | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 2287 | char *tmp; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2288 | int exitcode = EXIT_SUCCESS; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2289 | char *interfaces_to_take_down = NULL; | 
| 2290 | size_t interfaces_to_take_down_size = 0; | |
| 673
by Teddy Hogeborn Make mandos-client prefer /run/tmp over /tmp. | 2291 | char run_tempdir[] = "/run/tmp/mandosXXXXXX"; | 
| 2292 | char old_tempdir[] = "/tmp/mandosXXXXXX"; | |
| 2293 | char *tempdir = NULL; | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2294 | AvahiIfIndex if_index = AVAHI_IF_UNSPEC; | 
| 2295 | const char *seckey = PATHDIR "/" SECKEY; | |
| 2296 | const char *pubkey = PATHDIR "/" PUBKEY; | |
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 2297 | const char *dh_params_file = NULL; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2298 | char *interfaces_hooks = NULL; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2299 |   
 | 
| 2300 | bool gnutls_initialized = false; | |
| 2301 | bool gpgme_initialized = false; | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 2302 | float delay = 2.5f; | 
| 485
by Teddy Hogeborn Merge from Björn. | 2303 | double retry_interval = 10; /* 10s between trying a server and | 
| 2304 | 				 retrying the same server again */
 | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 2305 |   
 | 
| 369
by Teddy Hogeborn * init.d-mandos (Required-Start, Required-Stop): Bug fix: Added | 2306 | struct sigaction old_sigterm_action = { .sa_handler = SIG_DFL }; | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 2307 | struct sigaction sigterm_action = { .sa_handler = handle_sigterm }; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2308 |   
 | 
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 2309 | uid = getuid(); | 
| 2310 | gid = getgid(); | |
| 2311 |   
 | |
| 2312 | /* Lower any group privileges we might have, just to be safe */ | |
| 2313 | errno = 0; | |
| 2314 | ret = setgid(gid); | |
| 2315 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2316 | perror_plus("setgid"); | 
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 2317 | } | 
| 2318 |   
 | |
| 2319 | /* Lower user privileges (temporarily) */ | |
| 2320 | errno = 0; | |
| 2321 | ret = seteuid(uid); | |
| 2322 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2323 | perror_plus("seteuid"); | 
| 368
by Teddy Hogeborn * plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted | 2324 | } | 
| 2325 |   
 | |
| 2326 | if(quit_now){ | |
| 2327 | goto end; | |
| 2328 | } | |
| 2329 |   
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2330 | { | 
| 2331 | struct argp_option options[] = { | |
| 2332 | { .name = "debug", .key = 128, | |
| 2333 | .doc = "Debug mode", .group = 3 }, | |
| 2334 | { .name = "connect", .key = 'c', | |
| 2335 | .arg = "ADDRESS:PORT", | |
| 2336 | .doc = "Connect directly to a specific Mandos server", | |
| 2337 | .group = 1 }, | |
| 2338 | { .name = "interface", .key = 'i', | |
| 2339 | .arg = "NAME", | |
| 304
by Teddy Hogeborn Four new interrelated features: | 2340 | .doc = "Network interface that will be used to search for" | 
| 2341 | " Mandos servers", | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2342 | .group = 1 }, | 
| 2343 | { .name = "seckey", .key = 's', | |
| 2344 | .arg = "FILE", | |
| 2345 | .doc = "OpenPGP secret key file base name", | |
| 2346 | .group = 1 }, | |
| 2347 | { .name = "pubkey", .key = 'p', | |
| 2348 | .arg = "FILE", | |
| 2349 | .doc = "OpenPGP public key file base name", | |
| 2350 | .group = 2 }, | |
| 2351 | { .name = "dh-bits", .key = 129, | |
| 2352 | .arg = "BITS", | |
| 2353 | .doc = "Bit length of the prime number used in the" | |
| 2354 | " Diffie-Hellman key exchange", | |
| 2355 | .group = 2 }, | |
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 2356 | { .name = "dh-params", .key = 134, | 
| 2357 | .arg = "FILE", | |
| 2358 | .doc = "PEM-encoded PKCS#3 file with pre-generated parameters" | |
| 2359 | " for the Diffie-Hellman key exchange", | |
| 2360 | .group = 2 }, | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2361 | { .name = "priority", .key = 130, | 
| 2362 | .arg = "STRING", | |
| 2363 | .doc = "GnuTLS priority string for the TLS handshake", | |
| 2364 | .group = 1 }, | |
| 2365 | { .name = "delay", .key = 131, | |
| 2366 | .arg = "SECONDS", | |
| 2367 | .doc = "Maximum delay to wait for interface startup", | |
| 2368 | .group = 2 }, | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2369 | { .name = "retry", .key = 132, | 
| 2370 | .arg = "SECONDS", | |
| 535.1.1
by teddy at recompile Add wireless network hook | 2371 | .doc = "Retry interval used when denied by the Mandos server", | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2372 | .group = 2 }, | 
| 505.3.4
by teddy at bsnet * plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the | 2373 | { .name = "network-hook-dir", .key = 133, | 
| 2374 | .arg = "DIR", | |
| 2375 | .doc = "Directory where network hooks are located", | |
| 2376 | .group = 2 }, | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2377 | /* | 
| 2378 |        * These reproduce what we would get without ARGP_NO_HELP
 | |
| 2379 |        */
 | |
| 2380 | { .name = "help", .key = '?', | |
| 2381 | .doc = "Give this help list", .group = -1 }, | |
| 2382 | { .name = "usage", .key = -3, | |
| 2383 | .doc = "Give a short usage message", .group = -1 }, | |
| 2384 | { .name = "version", .key = 'V', | |
| 2385 | .doc = "Print program version", .group = -1 }, | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2386 | { .name = NULL } | 
| 2387 | }; | |
| 2388 |     
 | |
| 2389 | error_t parse_opt(int key, char *arg, | |
| 2390 | struct argp_state *state){ | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2391 | errno = 0; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2392 | switch(key){ | 
| 2393 | case 128: /* --debug */ | |
| 2394 | debug = true; | |
| 2395 | break; | |
| 2396 | case 'c': /* --connect */ | |
| 2397 | connect_to = arg; | |
| 2398 | break; | |
| 2399 | case 'i': /* --interface */ | |
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 2400 | ret_errno = argz_add_sep(&mc.interfaces, &mc.interfaces_size, | 
| 2401 | arg, (int)','); | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2402 | if(ret_errno != 0){ | 
| 2403 | argp_error(state, "%s", strerror(ret_errno)); | |
| 2404 | } | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2405 | break; | 
| 2406 | case 's': /* --seckey */ | |
| 2407 | seckey = arg; | |
| 2408 | break; | |
| 2409 | case 'p': /* --pubkey */ | |
| 2410 | pubkey = arg; | |
| 2411 | break; | |
| 2412 | case 129: /* --dh-bits */ | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 2413 | errno = 0; | 
| 2414 | tmpmax = strtoimax(arg, &tmp, 10); | |
| 2415 | if(errno != 0 or tmp == arg or *tmp != '\0' | |
| 2416 | or tmpmax != (typeof(mc.dh_bits))tmpmax){ | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2417 | argp_error(state, "Bad number of DH bits"); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2418 | } | 
| 2419 | mc.dh_bits = (typeof(mc.dh_bits))tmpmax; | |
| 2420 | break; | |
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 2421 | case 134: /* --dh-params */ | 
| 2422 | dh_params_file = arg; | |
| 2423 | break; | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2424 | case 130: /* --priority */ | 
| 2425 | mc.priority = arg; | |
| 2426 | break; | |
| 2427 | case 131: /* --delay */ | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 2428 | errno = 0; | 
| 2429 | delay = strtof(arg, &tmp); | |
| 2430 | if(errno != 0 or tmp == arg or *tmp != '\0'){ | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2431 | argp_error(state, "Bad delay"); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2432 | } | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2433 | case 132: /* --retry */ | 
| 2434 | errno = 0; | |
| 2435 | retry_interval = strtod(arg, &tmp); | |
| 2436 | if(errno != 0 or tmp == arg or *tmp != '\0' | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 2437 | or (retry_interval * 1000) > INT_MAX | 
| 2438 | or retry_interval < 0){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2439 | argp_error(state, "Bad retry interval"); | 
| 2440 | } | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2441 | break; | 
| 505.3.4
by teddy at bsnet * plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the | 2442 | case 133: /* --network-hook-dir */ | 
| 2443 | hookdir = arg; | |
| 2444 | break; | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2445 | /* | 
| 2446 | 	 * These reproduce what we would get without ARGP_NO_HELP
 | |
| 2447 | 	 */
 | |
| 2448 | case '?': /* --help */ | |
| 2449 | argp_state_help(state, state->out_stream, | |
| 2450 | (ARGP_HELP_STD_HELP | ARGP_HELP_EXIT_ERR) | |
| 2451 | & ~(unsigned int)ARGP_HELP_EXIT_OK); | |
| 2452 | case -3: /* --usage */ | |
| 2453 | argp_state_help(state, state->out_stream, | |
| 2454 | ARGP_HELP_USAGE | ARGP_HELP_EXIT_ERR); | |
| 2455 | case 'V': /* --version */ | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 2456 | fprintf_plus(state->out_stream, "%s\n", argp_program_version); | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2457 | exit(argp_err_exit_status); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2458 | break; | 
| 2459 | default: | |
| 2460 | return ARGP_ERR_UNKNOWN; | |
| 2461 | } | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2462 | return errno; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2463 | } | 
| 2464 |     
 | |
| 2465 | struct argp argp = { .options = options, .parser = parse_opt, | |
| 2466 | .args_doc = "", | |
| 2467 | .doc = "Mandos client -- Get and decrypt" | |
| 2468 | " passwords from a Mandos server" }; | |
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2469 | ret_errno = argp_parse(&argp, argc, argv, | 
| 2470 | ARGP_IN_ORDER | ARGP_NO_HELP, 0, NULL); | |
| 2471 | switch(ret_errno){ | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2472 | case 0: | 
| 2473 | break; | |
| 2474 | case ENOMEM: | |
| 2475 | default: | |
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2476 | errno = ret_errno; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2477 | perror_plus("argp_parse"); | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 2478 | exitcode = EX_OSERR; | 
| 2479 | goto end; | |
| 2480 | case EINVAL: | |
| 2481 | exitcode = EX_USAGE; | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2482 | goto end; | 
| 2483 | } | |
| 2484 | } | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 2485 |   
 | 
| 505.3.16
by teddy at bsnet * network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. | 2486 | { | 
| 487
by Teddy Hogeborn * initramfs-tools-script: Abort if plugin-runner is missing. Removed | 2487 | /* Work around Debian bug #633582: | 
| 2488 |        <http://bugs.debian.org/633582> */
 | |
| 2489 |     
 | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2490 | /* Re-raise privileges */ | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2491 | ret = raise_privileges(); | 
| 2492 | if(ret != 0){ | |
| 2493 | errno = ret; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2494 | perror_plus("Failed to raise privileges"); | 
| 2495 | } else { | |
| 505.3.16
by teddy at bsnet * network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. | 2496 | struct stat st; | 
| 2497 |       
 | |
| 2498 | if(strcmp(seckey, PATHDIR "/" SECKEY) == 0){ | |
| 2499 | int seckey_fd = open(seckey, O_RDONLY); | |
| 2500 | if(seckey_fd == -1){ | |
| 2501 | perror_plus("open"); | |
| 2502 | } else { | |
| 2503 | ret = (int)TEMP_FAILURE_RETRY(fstat(seckey_fd, &st)); | |
| 2504 | if(ret == -1){ | |
| 2505 | perror_plus("fstat"); | |
| 2506 | } else { | |
| 2507 | if(S_ISREG(st.st_mode) | |
| 2508 | and st.st_uid == 0 and st.st_gid == 0){ | |
| 2509 | ret = fchown(seckey_fd, uid, gid); | |
| 2510 | if(ret == -1){ | |
| 2511 | perror_plus("fchown"); | |
| 2512 | } | |
| 2513 | } | |
| 2514 | } | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2515 | close(seckey_fd); | 
| 505.3.16
by teddy at bsnet * network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. | 2516 | } | 
| 2517 | } | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 2518 |       
 | 
| 505.3.16
by teddy at bsnet * network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. | 2519 | if(strcmp(pubkey, PATHDIR "/" PUBKEY) == 0){ | 
| 2520 | int pubkey_fd = open(pubkey, O_RDONLY); | |
| 2521 | if(pubkey_fd == -1){ | |
| 2522 | perror_plus("open"); | |
| 2523 | } else { | |
| 2524 | ret = (int)TEMP_FAILURE_RETRY(fstat(pubkey_fd, &st)); | |
| 2525 | if(ret == -1){ | |
| 2526 | perror_plus("fstat"); | |
| 2527 | } else { | |
| 2528 | if(S_ISREG(st.st_mode) | |
| 2529 | and st.st_uid == 0 and st.st_gid == 0){ | |
| 2530 | ret = fchown(pubkey_fd, uid, gid); | |
| 2531 | if(ret == -1){ | |
| 2532 | perror_plus("fchown"); | |
| 2533 | } | |
| 2534 | } | |
| 2535 | } | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2536 | close(pubkey_fd); | 
| 505.3.16
by teddy at bsnet * network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. | 2537 | } | 
| 2538 | } | |
| 738.1.2
by Teddy Hogeborn mandos-client: Try to start a plugin to add and remove a local route. | 2539 |       
 | 
| 776
by Teddy Hogeborn mandos-client: Bug fix: don't crash if --dh-params was not used. | 2540 | if(dh_params_file != NULL | 
| 2541 | and strcmp(dh_params_file, PATHDIR "/dhparams.pem" ) == 0){ | |
| 765
by Teddy Hogeborn Install client Diffie-Hellman parameters into initramfs. | 2542 | int dhparams_fd = open(dh_params_file, O_RDONLY); | 
| 2543 | if(dhparams_fd == -1){ | |
| 2544 | perror_plus("open"); | |
| 2545 | } else { | |
| 2546 | ret = (int)TEMP_FAILURE_RETRY(fstat(dhparams_fd, &st)); | |
| 2547 | if(ret == -1){ | |
| 2548 | perror_plus("fstat"); | |
| 2549 | } else { | |
| 2550 | if(S_ISREG(st.st_mode) | |
| 2551 | and st.st_uid == 0 and st.st_gid == 0){ | |
| 2552 | ret = fchown(dhparams_fd, uid, gid); | |
| 2553 | if(ret == -1){ | |
| 2554 | perror_plus("fchown"); | |
| 2555 | } | |
| 2556 | } | |
| 2557 | } | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 2558 | close(dhparams_fd); | 
| 765
by Teddy Hogeborn Install client Diffie-Hellman parameters into initramfs. | 2559 | } | 
| 2560 | } | |
| 2561 |       
 | |
| 505.3.11
by Teddy Hogeborn * Makefile (run-client): Add "--network-hook-dir" option. | 2562 | /* Lower privileges */ | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2563 | ret = lower_privileges(); | 
| 2564 | if(ret != 0){ | |
| 2565 | errno = ret; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2566 | perror_plus("Failed to lower privileges"); | 
| 2567 | } | |
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 2568 | } | 
| 2569 | } | |
| 2570 |   
 | |
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 2571 | /* Remove invalid interface names (except "none") */ | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2572 | { | 
| 2573 | char *interface = NULL; | |
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 2574 | while((interface = argz_next(mc.interfaces, mc.interfaces_size, | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2575 | interface))){ | 
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 2576 | if(strcmp(interface, "none") != 0 | 
| 2577 | and if_nametoindex(interface) == 0){ | |
| 2578 | if(interface[0] != '\0'){ | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2579 | fprintf_plus(stderr, "Not using nonexisting interface" | 
| 2580 | " \"%s\"\n", interface); | |
| 2581 | } | |
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 2582 | argz_delete(&mc.interfaces, &mc.interfaces_size, interface); | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2583 | interface = NULL; | 
| 2584 | } | |
| 2585 | } | |
| 2586 | } | |
| 2587 |   
 | |
| 505.3.16
by teddy at bsnet * network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. | 2588 | /* Run network hooks */ | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2589 | { | 
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 2590 | if(mc.interfaces != NULL){ | 
| 2591 | interfaces_hooks = malloc(mc.interfaces_size); | |
| 599
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Bug fix: Set DEVICE environment | 2592 | if(interfaces_hooks == NULL){ | 
| 2593 | perror_plus("malloc"); | |
| 2594 | goto end; | |
| 2595 | } | |
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 2596 | memcpy(interfaces_hooks, mc.interfaces, mc.interfaces_size); | 
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 2597 | argz_stringify(interfaces_hooks, mc.interfaces_size, (int)','); | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2598 | } | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2599 | run_network_hooks("start", interfaces_hooks != NULL ? | 
| 2600 | interfaces_hooks : "", delay); | |
| 505.3.16
by teddy at bsnet * network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. | 2601 | } | 
| 2602 |   
 | |
| 24.1.135
by Björn Påhlsson Earlier signal handling | 2603 | if(not debug){ | 
| 2604 | avahi_set_log_function(empty_log); | |
| 2605 | } | |
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 2606 |   
 | 
| 24.1.135
by Björn Påhlsson Earlier signal handling | 2607 | /* Initialize Avahi early so avahi_simple_poll_quit() can be called | 
| 2608 |      from the signal handler */
 | |
| 2609 | /* Initialize the pseudo-RNG for Avahi */ | |
| 2610 | srand((unsigned int) time(NULL)); | |
| 601
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Removed "simple_poll" | 2611 | simple_poll = avahi_simple_poll_new(); | 
| 2612 | if(simple_poll == NULL){ | |
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 2613 | fprintf_plus(stderr, | 
| 2614 | "Avahi: Failed to create simple poll object.\n"); | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2615 | exitcode = EX_UNAVAILABLE; | 
| 24.1.135
by Björn Påhlsson Earlier signal handling | 2616 | goto end; | 
| 2617 | } | |
| 309
by Teddy Hogeborn Merge from Björn: | 2618 |   
 | 
| 24.1.135
by Björn Påhlsson Earlier signal handling | 2619 | sigemptyset(&sigterm_action.sa_mask); | 
| 309
by Teddy Hogeborn Merge from Björn: | 2620 | ret = sigaddset(&sigterm_action.sa_mask, SIGINT); | 
| 2621 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2622 | perror_plus("sigaddset"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2623 | exitcode = EX_OSERR; | 
| 309
by Teddy Hogeborn Merge from Björn: | 2624 | goto end; | 
| 2625 | } | |
| 2626 | ret = sigaddset(&sigterm_action.sa_mask, SIGHUP); | |
| 2627 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2628 | perror_plus("sigaddset"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2629 | exitcode = EX_OSERR; | 
| 309
by Teddy Hogeborn Merge from Björn: | 2630 | goto end; | 
| 2631 | } | |
| 24.1.135
by Björn Påhlsson Earlier signal handling | 2632 | ret = sigaddset(&sigterm_action.sa_mask, SIGTERM); | 
| 2633 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2634 | perror_plus("sigaddset"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2635 | exitcode = EX_OSERR; | 
| 24.1.135
by Björn Påhlsson Earlier signal handling | 2636 | goto end; | 
| 2637 | } | |
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 2638 | /* Need to check if the handler is SIG_IGN before handling: | 
| 2639 |      | [[info:libc:Initial Signal Actions]] |
 | |
| 2640 |      | [[info:libc:Basic Signal Handling]]  |
 | |
| 2641 |   */
 | |
| 2642 | ret = sigaction(SIGINT, NULL, &old_sigterm_action); | |
| 2643 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2644 | perror_plus("sigaction"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2645 | return EX_OSERR; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 2646 | } | 
| 2647 | if(old_sigterm_action.sa_handler != SIG_IGN){ | |
| 2648 | ret = sigaction(SIGINT, &sigterm_action, NULL); | |
| 2649 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2650 | perror_plus("sigaction"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2651 | exitcode = EX_OSERR; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 2652 | goto end; | 
| 2653 | } | |
| 2654 | } | |
| 2655 | ret = sigaction(SIGHUP, NULL, &old_sigterm_action); | |
| 2656 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2657 | perror_plus("sigaction"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2658 | return EX_OSERR; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 2659 | } | 
| 2660 | if(old_sigterm_action.sa_handler != SIG_IGN){ | |
| 2661 | ret = sigaction(SIGHUP, &sigterm_action, NULL); | |
| 2662 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2663 | perror_plus("sigaction"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2664 | exitcode = EX_OSERR; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 2665 | goto end; | 
| 2666 | } | |
| 2667 | } | |
| 2668 | ret = sigaction(SIGTERM, NULL, &old_sigterm_action); | |
| 2669 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2670 | perror_plus("sigaction"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2671 | return EX_OSERR; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 2672 | } | 
| 2673 | if(old_sigterm_action.sa_handler != SIG_IGN){ | |
| 2674 | ret = sigaction(SIGTERM, &sigterm_action, NULL); | |
| 2675 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2676 | perror_plus("sigaction"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2677 | exitcode = EX_OSERR; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 2678 | goto end; | 
| 2679 | } | |
| 354
by Teddy Hogeborn * plugins.d/mandos-client.c (signal_received): New. | 2680 | } | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2681 |   
 | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2682 | /* If no interfaces were specified, make a list */ | 
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 2683 | if(mc.interfaces == NULL){ | 
| 699
by Teddy Hogeborn Fix free() of possibly uninitialized pointer in mandos-client. | 2684 | struct dirent **direntries = NULL; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2685 | /* Look for any good interfaces */ | 
| 2686 | ret = scandir(sys_class_net, &direntries, good_interface, | |
| 2687 | alphasort); | |
| 2688 | if(ret >= 1){ | |
| 2689 | /* Add all found interfaces to interfaces list */ | |
| 2690 | for(int i = 0; i < ret; ++i){ | |
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 2691 | ret_errno = argz_add(&mc.interfaces, &mc.interfaces_size, | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2692 | direntries[i]->d_name); | 
| 2693 | if(ret_errno != 0){ | |
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 2694 | errno = ret_errno; | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2695 | perror_plus("argz_add"); | 
| 715
by Teddy Hogeborn mandos-client: Bug Fix: Fix some memory leaks. | 2696 | free(direntries[i]); | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2697 | continue; | 
| 2698 | } | |
| 2699 | if(debug){ | |
| 2700 | fprintf_plus(stderr, "Will use interface \"%s\"\n", | |
| 2701 | direntries[i]->d_name); | |
| 2702 | } | |
| 715
by Teddy Hogeborn mandos-client: Bug Fix: Fix some memory leaks. | 2703 | free(direntries[i]); | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2704 | } | 
| 2705 | free(direntries); | |
| 2706 | } else { | |
| 704
by Teddy Hogeborn mandos-client: Fix some bugs on error conditions. | 2707 | if(ret == 0){ | 
| 2708 | free(direntries); | |
| 2709 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2710 | fprintf_plus(stderr, "Could not find a network interface\n"); | 
| 2711 | exitcode = EXIT_FAILURE; | |
| 2712 | goto end; | |
| 2713 | } | |
| 2714 | } | |
| 2715 |   
 | |
| 605
by Teddy Hogeborn * plugins.d/mandos-client.c: Comment changes | 2716 | /* Bring up interfaces which are down, and remove any "none"s */ | 
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 2717 | { | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2718 | char *interface = NULL; | 
| 603
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): New "interfaces" and | 2719 | while((interface = argz_next(mc.interfaces, mc.interfaces_size, | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2720 | interface))){ | 
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 2721 | /* If interface name is "none", stop bringing up interfaces. | 
| 2722 | 	 Also remove all instances of "none" from the list */
 | |
| 2723 | if(strcmp(interface, "none") == 0){ | |
| 2724 | argz_delete(&mc.interfaces, &mc.interfaces_size, | |
| 2725 | interface); | |
| 2726 | interface = NULL; | |
| 2727 | while((interface = argz_next(mc.interfaces, | |
| 2728 | mc.interfaces_size, interface))){ | |
| 2729 | if(strcmp(interface, "none") == 0){ | |
| 2730 | argz_delete(&mc.interfaces, &mc.interfaces_size, | |
| 2731 | interface); | |
| 2732 | interface = NULL; | |
| 2733 | } | |
| 2734 | } | |
| 2735 | break; | |
| 2736 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2737 | bool interface_was_up = interface_is_up(interface); | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2738 | errno = bring_up_interface(interface, delay); | 
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2739 | if(not interface_was_up){ | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2740 | if(errno != 0){ | 
| 767
by Teddy Hogeborn plugins.d/mandos-client.c (main): See why it failed to bring up interface. | 2741 | fprintf_plus(stderr, "Failed to bring up interface \"%s\":" | 
| 2742 | " %s\n", interface, strerror(errno)); | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2743 | } else { | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2744 | errno = argz_add(&interfaces_to_take_down, | 
| 2745 | &interfaces_to_take_down_size, | |
| 2746 | interface); | |
| 2747 | if(errno != 0){ | |
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 2748 | perror_plus("argz_add"); | 
| 2749 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 2750 | } | 
| 2751 | } | |
| 2752 | } | |
| 2753 | if(debug and (interfaces_to_take_down == NULL)){ | |
| 2754 | fprintf_plus(stderr, "No interfaces were brought up\n"); | |
| 365
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Bug fix: Check result of setgid(). | 2755 | } | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2756 | } | 
| 2757 |   
 | |
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 2758 | /* If we only got one interface, explicitly use only that one */ | 
| 2759 | if(argz_count(mc.interfaces, mc.interfaces_size) == 1){ | |
| 2760 | if(debug){ | |
| 2761 | fprintf_plus(stderr, "Using only interface \"%s\"\n", | |
| 2762 | mc.interfaces); | |
| 2763 | } | |
| 2764 | if_index = (AvahiIfIndex)if_nametoindex(mc.interfaces); | |
| 2765 | } | |
| 2766 |   
 | |
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 2767 | if(quit_now){ | 
| 2768 | goto end; | |
| 2769 | } | |
| 2770 |   
 | |
| 762
by Teddy Hogeborn mandos-client: Add --dh-params FILE option. | 2771 | ret = init_gnutls_global(pubkey, seckey, dh_params_file, &mc); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2772 | if(ret == -1){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 2773 | fprintf_plus(stderr, "init_gnutls_global failed\n"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2774 | exitcode = EX_UNAVAILABLE; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2775 | goto end; | 
| 2776 | } else { | |
| 2777 | gnutls_initialized = true; | |
| 2778 | } | |
| 2779 |   
 | |
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 2780 | if(quit_now){ | 
| 2781 | goto end; | |
| 2782 | } | |
| 2783 |   
 | |
| 673
by Teddy Hogeborn Make mandos-client prefer /run/tmp over /tmp. | 2784 | /* Try /run/tmp before /tmp */ | 
| 2785 | tempdir = mkdtemp(run_tempdir); | |
| 2786 | if(tempdir == NULL and errno == ENOENT){ | |
| 2787 | if(debug){ | |
| 2788 | fprintf_plus(stderr, "Tempdir %s did not work, trying %s\n", | |
| 2789 | run_tempdir, old_tempdir); | |
| 2790 | } | |
| 2791 | tempdir = mkdtemp(old_tempdir); | |
| 2792 | } | |
| 2793 | if(tempdir == NULL){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2794 | perror_plus("mkdtemp"); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2795 | goto end; | 
| 2796 | } | |
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 2797 |   
 | 
| 2798 | if(quit_now){ | |
| 2799 | goto end; | |
| 2800 | } | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2801 |   
 | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 2802 | if(not init_gpgme(pubkey, seckey, tempdir, &mc)){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 2803 | fprintf_plus(stderr, "init_gpgme failed\n"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2804 | exitcode = EX_UNAVAILABLE; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2805 | goto end; | 
| 2806 | } else { | |
| 2807 | gpgme_initialized = true; | |
| 2808 | } | |
| 2809 |   
 | |
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 2810 | if(quit_now){ | 
| 2811 | goto end; | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2812 | } | 
| 2813 |   
 | |
| 2814 | if(connect_to != NULL){ | |
| 2815 | /* Connect directly, do not use Zeroconf */ | |
| 2816 | /* (Mainly meant for debugging) */ | |
| 2817 | char *address = strrchr(connect_to, ':'); | |
| 594.1.1
by Teddy Hogeborn * plugins.d/mandos-client.c: Refactoring. | 2818 |     
 | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2819 | if(address == NULL){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 2820 | fprintf_plus(stderr, "No colon in address\n"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2821 | exitcode = EX_USAGE; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2822 | goto end; | 
| 2823 | } | |
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 2824 |     
 | 
| 2825 | if(quit_now){ | |
| 2826 | goto end; | |
| 2827 | } | |
| 2828 |     
 | |
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 2829 | in_port_t port; | 
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 2830 | errno = 0; | 
| 2831 | tmpmax = strtoimax(address+1, &tmp, 10); | |
| 2832 | if(errno != 0 or tmp == address+1 or *tmp != '\0' | |
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 2833 | or tmpmax != (in_port_t)tmpmax){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 2834 | fprintf_plus(stderr, "Bad port number\n"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2835 | exitcode = EX_USAGE; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2836 | goto end; | 
| 2837 | } | |
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 2838 |     
 | 
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 2839 | if(quit_now){ | 
| 2840 | goto end; | |
| 2841 | } | |
| 2842 |     
 | |
| 597
by Teddy Hogeborn * plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for | 2843 | port = (in_port_t)tmpmax; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2844 | *address = '\0'; | 
| 304
by Teddy Hogeborn Four new interrelated features: | 2845 | /* Colon in address indicates IPv6 */ | 
| 2846 | int af; | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 2847 | if(strchr(connect_to, ':') != NULL){ | 
| 304
by Teddy Hogeborn Four new interrelated features: | 2848 | af = AF_INET6; | 
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 2849 | /* Accept [] around IPv6 address - see RFC 5952 */ | 
| 2850 | if(connect_to[0] == '[' and address[-1] == ']') | |
| 2851 | { | |
| 2852 | connect_to++; | |
| 2853 | address[-1] = '\0'; | |
| 2854 | } | |
| 304
by Teddy Hogeborn Four new interrelated features: | 2855 | } else { | 
| 2856 | af = AF_INET; | |
| 2857 | } | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 2858 | address = connect_to; | 
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 2859 |     
 | 
| 2860 | if(quit_now){ | |
| 2861 | goto end; | |
| 2862 | } | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 2863 |     
 | 
| 24.1.163
by Björn Påhlsson mandos-client: Added never ending loop for --connect | 2864 | while(not quit_now){ | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 2865 | ret = start_mandos_communication(address, port, if_index, af, | 
| 2866 | &mc); | |
| 24.1.163
by Björn Påhlsson mandos-client: Added never ending loop for --connect | 2867 | if(quit_now or ret == 0){ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2868 | break; | 
| 2869 | } | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 2870 | if(debug){ | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 2871 | fprintf_plus(stderr, "Retrying in %d seconds\n", | 
| 2872 | (int)retry_interval); | |
| 491
by teddy at bsnet * plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. | 2873 | } | 
| 620
by Teddy Hogeborn * plugin-runner.c (main): Bug fix; do not ignore return value of | 2874 | sleep((unsigned int)retry_interval); | 
| 492
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not even try to work around | 2875 | } | 
| 2876 |     
 | |
| 671
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 2877 | if(not quit_now){ | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2878 | exitcode = EXIT_SUCCESS; | 
| 2879 | } | |
| 505.2.3
by Teddy Hogeborn Intermediate commit - this does *not* work yet. | 2880 |     
 | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2881 | goto end; | 
| 2882 | } | |
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 2883 |   
 | 
| 2884 | if(quit_now){ | |
| 2885 | goto end; | |
| 2886 | } | |
| 2887 |   
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2888 | { | 
| 2889 | AvahiServerConfig config; | |
| 2890 | /* Do not publish any local Zeroconf records */ | |
| 2891 | avahi_server_config_init(&config); | |
| 2892 | config.publish_hinfo = 0; | |
| 2893 | config.publish_addresses = 0; | |
| 2894 | config.publish_workstation = 0; | |
| 2895 | config.publish_domain = 0; | |
| 2896 |     
 | |
| 2897 | /* Allocate a new server */ | |
| 601
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Removed "simple_poll" | 2898 | mc.server = avahi_server_new(avahi_simple_poll_get(simple_poll), | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2899 | &config, NULL, NULL, &ret); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2900 |     
 | 
| 2901 | /* Free the Avahi configuration data */ | |
| 2902 | avahi_server_config_free(&config); | |
| 2903 | } | |
| 2904 |   
 | |
| 2905 | /* Check if creating the Avahi server object succeeded */ | |
| 2906 | if(mc.server == NULL){ | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 2907 | fprintf_plus(stderr, "Failed to create Avahi server: %s\n", | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2908 | avahi_strerror(ret)); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2909 | exitcode = EX_UNAVAILABLE; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2910 | goto end; | 
| 2911 | } | |
| 2912 |   
 | |
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 2913 | if(quit_now){ | 
| 2914 | goto end; | |
| 2915 | } | |
| 2916 |   
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2917 | /* Create the Avahi service browser */ | 
| 2918 | sb = avahi_s_service_browser_new(mc.server, if_index, | |
| 313
by Teddy Hogeborn * plugins.d/mandos-client.c (browse_callback, main): Do not require | 2919 | AVAHI_PROTO_UNSPEC, "_mandos._tcp", | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 2920 | NULL, 0, browse_callback, | 
| 2921 | (void *)&mc); | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2922 | if(sb == NULL){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 2923 | fprintf_plus(stderr, "Failed to create service browser: %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 2924 | avahi_strerror(avahi_server_errno(mc.server))); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 2925 | exitcode = EX_UNAVAILABLE; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2926 | goto end; | 
| 2927 | } | |
| 307
by Teddy Hogeborn Merge from Björn: | 2928 |   
 | 
| 353
by Teddy Hogeborn * plugins.d/mandos-client.c (quit_now): Move up declaration before | 2929 | if(quit_now){ | 
| 2930 | goto end; | |
| 2931 | } | |
| 2932 |   
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2933 | /* Run the main loop */ | 
| 2934 |   
 | |
| 2935 | if(debug){ | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 2936 | fprintf_plus(stderr, "Starting Avahi loop search\n"); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2937 | } | 
| 687
by Teddy Hogeborn White space fix only. | 2938 |   
 | 
| 601
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Removed "simple_poll" | 2939 | ret = avahi_loop_with_timeout(simple_poll, | 
| 602
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Moved to inside "main()". | 2940 | (int)(retry_interval * 1000), &mc); | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2941 | if(debug){ | 
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 2942 | fprintf_plus(stderr, "avahi_loop_with_timeout exited %s\n", | 
| 505.3.9
by Teddy Hogeborn * plugins.d/mandos-client.c: Merge unified printing system. | 2943 | (ret == 0) ? "successfully" : "with error"); | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2944 | } | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2945 |   
 | 
| 40
by Teddy Hogeborn * plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its | 2946 | end: | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2947 |   
 | 
| 2948 | if(debug){ | |
| 505.2.6
by Björn Påhlsson replace calls to fprintf with fprintf_plus. | 2949 | fprintf_plus(stderr, "%s exiting\n", argv[0]); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2950 | } | 
| 2951 |   
 | |
| 2952 | /* Cleanup things */ | |
| 604
by Teddy Hogeborn * plugins.d/mandos-client (start_mandos_communication): Bug fix; skip | 2953 | free(mc.interfaces); | 
| 2954 |   
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2955 | if(sb != NULL) | 
| 2956 | avahi_s_service_browser_free(sb); | |
| 2957 |   
 | |
| 2958 | if(mc.server != NULL) | |
| 2959 | avahi_server_free(mc.server); | |
| 2960 |   
 | |
| 601
by Teddy Hogeborn * plugins.d/mandos-client (mandos_context): Removed "simple_poll" | 2961 | if(simple_poll != NULL) | 
| 2962 | avahi_simple_poll_free(simple_poll); | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2963 |   
 | 
| 2964 | if(gnutls_initialized){ | |
| 2965 | gnutls_certificate_free_credentials(mc.cred); | |
| 2966 | gnutls_dh_params_deinit(mc.dh_params); | |
| 2967 | } | |
| 2968 |   
 | |
| 2969 | if(gpgme_initialized){ | |
| 2970 | gpgme_release(mc.ctx); | |
| 2971 | } | |
| 505.3.12
by Teddy Hogeborn * plugins.d/mandos-client.c (runnable_hook): Add debug output. | 2972 |   
 | 
| 485
by Teddy Hogeborn Merge from Björn. | 2973 | /* Cleans up the circular linked list of Mandos servers the client | 
| 2974 |      has seen */
 | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2975 | if(mc.current_server != NULL){ | 
| 2976 | mc.current_server->prev->next = NULL; | |
| 2977 | while(mc.current_server != NULL){ | |
| 2978 | server *next = mc.current_server->next; | |
| 714
by Teddy Hogeborn mandos-client: Fix mem free bug. | 2979 | #ifdef __GNUC__
 | 
| 2980 | #pragma GCC diagnostic push
 | |
| 2981 | #pragma GCC diagnostic ignored "-Wcast-qual"
 | |
| 2982 | #endif
 | |
| 2983 | free((char *)(mc.current_server->ip)); | |
| 2984 | #ifdef __GNUC__
 | |
| 2985 | #pragma GCC diagnostic pop
 | |
| 2986 | #endif
 | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 2987 | free(mc.current_server); | 
| 2988 | mc.current_server = next; | |
| 2989 | } | |
| 2990 | } | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 2991 |   
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2992 | /* Re-raise privileges */ | 
| 505.3.8
by Teddy Hogeborn * plugins.d/mandos-client.c (run_network_hooks): New. | 2993 | { | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 2994 | ret = raise_privileges(); | 
| 2995 | if(ret != 0){ | |
| 2996 | errno = ret; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 2997 | perror_plus("Failed to raise privileges"); | 
| 2998 | } else { | |
| 2999 |       
 | |
| 3000 | /* Run network hooks */ | |
| 3001 | run_network_hooks("stop", interfaces_hooks != NULL ? | |
| 3002 | interfaces_hooks : "", delay); | |
| 3003 |       
 | |
| 3004 | /* Take down the network interfaces which were brought up */ | |
| 3005 | { | |
| 3006 | char *interface = NULL; | |
| 3007 | while((interface=argz_next(interfaces_to_take_down, | |
| 3008 | interfaces_to_take_down_size, | |
| 3009 | interface))){ | |
| 819
by Teddy Hogeborn errno is of type int, not error_t | 3010 | ret = take_down_interface(interface); | 
| 3011 | if(ret != 0){ | |
| 3012 | errno = ret; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 3013 | perror_plus("Failed to take down interface"); | 
| 3014 | } | |
| 3015 | } | |
| 3016 | if(debug and (interfaces_to_take_down == NULL)){ | |
| 3017 | fprintf_plus(stderr, "No interfaces needed to be taken" | |
| 3018 | " down\n"); | |
| 3019 | } | |
| 3020 | } | |
| 3021 | } | |
| 680
by Teddy Hogeborn Minor changes to minimize diff from last release. | 3022 |     
 | 
| 819
by Teddy Hogeborn errno is of type int, not error_t | 3023 | ret = lower_privileges_permanently(); | 
| 3024 | if(ret != 0){ | |
| 3025 | errno = ret; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 3026 | perror_plus("Failed to lower privileges permanently"); | 
| 3027 | } | |
| 594.1.4
by Teddy Hogeborn * plugins.d/mandos-client.c (get_flags): Don't clobber errno. | 3028 | } | 
| 3029 |   
 | |
| 3030 | free(interfaces_to_take_down); | |
| 3031 | free(interfaces_hooks); | |
| 350
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Take down network interface on | 3032 |   
 | 
| 813
by Teddy Hogeborn Client: Remove new key directory introduced in GnuPG 2.1 | 3033 | void clean_dir_at(int base, const char * const dirname, | 
| 3034 | uintmax_t level){ | |
| 3035 | struct dirent **direntries = NULL; | |
| 3036 | int dret; | |
| 3037 | int dir_fd = (int)TEMP_FAILURE_RETRY(openat(base, dirname, | |
| 3038 | O_RDONLY | |
| 3039 | | O_NOFOLLOW | |
| 3040 | | O_DIRECTORY | |
| 3041 | | O_PATH)); | |
| 3042 | if(dir_fd == -1){ | |
| 3043 | perror_plus("open"); | |
| 3044 | } | |
| 3045 | int numentries = scandirat(dir_fd, ".", &direntries, | |
| 3046 | notdotentries, alphasort); | |
| 3047 | if(numentries >= 0){ | |
| 3048 | for(int i = 0; i < numentries; i++){ | |
| 3049 | if(debug){ | |
| 3050 | fprintf_plus(stderr, "Unlinking \"%s/%s\"\n", | |
| 3051 | dirname, direntries[i]->d_name); | |
| 3052 | } | |
| 3053 | dret = unlinkat(dir_fd, direntries[i]->d_name, 0); | |
| 3054 | if(dret == -1){ | |
| 3055 | if(errno == EISDIR){ | |
| 3056 | dret = unlinkat(dir_fd, direntries[i]->d_name, | |
| 3057 | AT_REMOVEDIR); | |
| 3058 | } | |
| 3059 | if((dret == -1) and (errno == ENOTEMPTY) | |
| 3060 | and (strcmp(direntries[i]->d_name, "private-keys-v1.d") | |
| 3061 | == 0) and (level == 0)){ | |
| 3062 | /* Recurse only in this special case */ | |
| 3063 | clean_dir_at(dir_fd, direntries[i]->d_name, level+1); | |
| 3064 | dret = 0; | |
| 3065 | } | |
| 3066 | if(dret == -1){ | |
| 3067 | fprintf_plus(stderr, "unlink(\"%s/%s\"): %s\n", dirname, | |
| 3068 | direntries[i]->d_name, strerror(errno)); | |
| 3069 | } | |
| 3070 | } | |
| 3071 | free(direntries[i]); | |
| 3072 | } | |
| 3073 |       
 | |
| 3074 | /* need to clean even if 0 because man page doesn't specify */ | |
| 3075 | free(direntries); | |
| 3076 | if(numentries == -1){ | |
| 3077 | perror_plus("scandirat"); | |
| 3078 | } | |
| 3079 | dret = unlinkat(base, dirname, AT_REMOVEDIR); | |
| 3080 | if(dret == -1 and errno != ENOENT){ | |
| 3081 | perror_plus("rmdir"); | |
| 3082 | } | |
| 3083 | } else { | |
| 3084 | perror_plus("scandirat"); | |
| 3085 | } | |
| 3086 | close(dir_fd); | |
| 3087 | } | |
| 3088 |   
 | |
| 24.1.172
by Björn Påhlsson using scandir instead of readdir | 3089 | /* Removes the GPGME temp directory and all files inside */ | 
| 673
by Teddy Hogeborn Make mandos-client prefer /run/tmp over /tmp. | 3090 | if(tempdir != NULL){ | 
| 813
by Teddy Hogeborn Client: Remove new key directory introduced in GnuPG 2.1 | 3091 | clean_dir_at(-1, tempdir, 0); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3092 | } | 
| 3093 |   
 | |
| 354
by Teddy Hogeborn * plugins.d/mandos-client.c (signal_received): New. | 3094 | if(quit_now){ | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 3095 | sigemptyset(&old_sigterm_action.sa_mask); | 
| 3096 | old_sigterm_action.sa_handler = SIG_DFL; | |
| 374
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Try harder to raise signal on | 3097 | ret = (int)TEMP_FAILURE_RETRY(sigaction(signal_received, | 
| 3098 | &old_sigterm_action, | |
| 3099 | NULL)); | |
| 354
by Teddy Hogeborn * plugins.d/mandos-client.c (signal_received): New. | 3100 | if(ret == -1){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 3101 | perror_plus("sigaction"); | 
| 354
by Teddy Hogeborn * plugins.d/mandos-client.c (signal_received): New. | 3102 | } | 
| 374
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Try harder to raise signal on | 3103 | do { | 
| 3104 | ret = raise(signal_received); | |
| 3105 | } while(ret != 0 and errno == EINTR); | |
| 3106 | if(ret != 0){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 3107 | perror_plus("raise"); | 
| 374
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Try harder to raise signal on | 3108 | abort(); | 
| 3109 | } | |
| 3110 | TEMP_FAILURE_RETRY(pause()); | |
| 354
by Teddy Hogeborn * plugins.d/mandos-client.c (signal_received): New. | 3111 | } | 
| 3112 |   
 | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 3113 | return exitcode; | 
| 13
by Björn Påhlsson Added following support: | 3114 | }
 |