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