/mandos/trunk : revision 602

To get this branch, use:

bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

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

Committer: Teddy Hogeborn
Date: 2012-06-16 23:25:46 UTC
Revision ID: teddy@recompile.se-20120616232546-dcrkmnhd4yhq6mvd

* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
                                            All users changed.
  (add_server): Take new "current_server" argument; all callers
                changed.
  (init_gpgme, pgp_packet_decrypt, init_gnutls_global,
  init_gnutls_session, start_mandos_communication,
  avahi_loop_with_timeout): Take new "mc" argument"; all callers
                            changed.
  (resolve_callback, browse_callback): Handle void pointer userdata as
                                       "mc", a pointer to
                                       mandos_context.  All callers
                                       changed.
  (main): New "mc" variable.

files modified:
plugins.d/mandos-client.c

Show diffs side-by-side

added added

removed removed

plugins.d/mandos-client.c

161

const char *priority;

162

gpgme_ctx_t ctx;

163

server *current_server;

164

char *interfaces;

165

size_t interfaces_size;

166

164

} mandos_context;

167

165

168

166

/* global so signal handler can reach it*/

1757

1755

int main(int argc, char *argv[]){

1758

1756

mandos_context mc = { .server = NULL, .dh_bits = 1024,

1759

1757

.priority = "SECURE256:!CTYPE-X.509:"

1760

"+CTYPE-OPENPGP", .current_server = NULL,

1761

.interfaces = NULL, .interfaces_size = 0 };

1758

"+CTYPE-OPENPGP", .current_server = NULL };

1762

1759

AvahiSServiceBrowser *sb = NULL;

1763

1760

error_t ret_errno;

1764

1761

int ret;

1765

1762

intmax_t tmpmax;

1766

1763

char *tmp;

1767

1764

int exitcode = EXIT_SUCCESS;

1765

char *interfaces = NULL;

1766

size_t interfaces_size = 0;

1768

1767

char *interfaces_to_take_down = NULL;

1769

1768

size_t interfaces_to_take_down_size = 0;

1770

1769

char tempdir[] = "/tmp/mandosXXXXXX";

1870

1869

connect_to = arg;

1871

1870

break;

1872

1871

case 'i': /* --interface */

1873

ret_errno = argz_add_sep(&mc.interfaces, &mc.interfaces_size,

1874

arg, (int)',');

1872

ret_errno = argz_add_sep(&interfaces, &interfaces_size, arg,

1873

(int)',');

1875

1874

if(ret_errno != 0){

1876

1875

argp_error(state, "%s", strerror(ret_errno));

1877

1876

}

2015

2014

/* Remove empty interface names */

2016

2015

{

2017

2016

char *interface = NULL;

2018

while((interface = argz_next(mc.interfaces, mc.interfaces_size,

2017

while((interface = argz_next(interfaces, interfaces_size,

2019

2018

interface))){

2020

2019

if(if_nametoindex(interface) == 0){

2021

2020

if(interface[0] != '\0' and strcmp(interface, "none") != 0){

2022

2021

fprintf_plus(stderr, "Not using nonexisting interface"

2023

2022

" \"%s\"\n", interface);

2024

2023

}

2025

argz_delete(&mc.interfaces, &mc.interfaces_size, interface);

2024

argz_delete(&interfaces, &interfaces_size, interface);

2026

2025

interface = NULL;

2027

2026

}

2028

2027

}

2031

2030

/* Run network hooks */

2032

2031

{

2033

2032

2034

if(mc.interfaces != NULL){

2035

interfaces_hooks = malloc(mc.interfaces_size);

2033

if(interfaces != NULL){

2034

interfaces_hooks = malloc(interfaces_size);

2036

2035

if(interfaces_hooks == NULL){

2037

2036

perror_plus("malloc");

2038

2037

goto end;

2039

2038

}

2040

memcpy(interfaces_hooks, mc.interfaces, mc.interfaces_size);

2041

interfaces_hooks_size = mc.interfaces_size;

2039

memcpy(interfaces_hooks, interfaces, interfaces_size);

2040

interfaces_hooks_size = interfaces_size;

2042

2041

argz_stringify(interfaces_hooks, interfaces_hooks_size,

2043

2042

(int)',');

2044

2043

}

2128

2127

}

2129

2128

2130

2129

/* If no interfaces were specified, make a list */

2131

if(mc.interfaces == NULL){

2130

if(interfaces == NULL){

2132

2131

struct dirent **direntries;

2133

2132

/* Look for any good interfaces */

2134

2133

ret = scandir(sys_class_net, &direntries, good_interface,

2136

2135

if(ret >= 1){

2137

2136

/* Add all found interfaces to interfaces list */

2138

2137

for(int i = 0; i < ret; ++i){

2139

ret_errno = argz_add(&mc.interfaces, &mc.interfaces_size,

2138

ret_errno = argz_add(&interfaces, &interfaces_size,

2140

2139

direntries[i]->d_name);

2141

2140

if(ret_errno != 0){

2142

2141

perror_plus("argz_add");

2157

2156

}

2158

2157

2159

2158

/* If we only got one interface, explicitly use only that one */

2160

if(argz_count(mc.interfaces, mc.interfaces_size) == 1){

2159

if(argz_count(interfaces, interfaces_size) == 1){

2161

2160

if(debug){

2162

2161

fprintf_plus(stderr, "Using only interface \"%s\"\n",

2163

mc.interfaces);

2162

interfaces);

2164

2163

}

2165

if_index = (AvahiIfIndex)if_nametoindex(mc.interfaces);

2164

if_index = (AvahiIfIndex)if_nametoindex(interfaces);

2166

2165

}

2167

2166

2168

2167

/* Bring up interfaces which are down */

2169

if(not (argz_count(mc.interfaces, mc.interfaces_size) == 1

2170

and strcmp(mc.interfaces, "none") == 0)){

2168

if(not (argz_count(interfaces, interfaces_size) == 1

2169

and strcmp(interfaces, "none") == 0)){

2171

2170

char *interface = NULL;

2172

while((interface = argz_next(mc.interfaces, mc.interfaces_size,

2171

while((interface = argz_next(interfaces, interfaces_size,

2173

2172

interface))){

2174

2173

bool interface_was_up = interface_is_up(interface);

2175

2174

ret = bring_up_interface(interface, delay);

2184

2183

}

2185

2184

}

2186

2185

}

2187

free(mc.interfaces);

2188

mc.interfaces = NULL;

2189

mc.interfaces_size = 0;

2186

free(interfaces);

2187

interfaces = NULL;

2188

interfaces_size = 0;

2190

2189

if(debug and (interfaces_to_take_down == NULL)){

2191

2190

fprintf_plus(stderr, "No interfaces were brought up\n");

2192

2191

}

Older »