/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.

Show diffs side-by-side

added added

removed removed

plugins.d/mandos-client.c

* "browse_callback", and parts of "main".

* Everything else is

* This program is free software: you can redistribute it and/or

* modify it under the terms of the GNU General Public License as

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*/

187

185

188

186

TEMP_FAILURE_RETRY(fprintf(stream, "Mandos plugin %s: ",

189

187

program_invocation_short_name));

190

return (int)TEMP_FAILURE_RETRY(vfprintf(stream, format, ap));

188

return TEMP_FAILURE_RETRY(vfprintf(stream, format, ap));

191

189

}

192

190

193

191

659

657

return -1;

660

658

}

661

659

662

/* If the interface is specified and we have a list of interfaces */

663

if(if_index != AVAHI_IF_UNSPEC and mc->interfaces != NULL){

664

/* Check if the interface is one of the interfaces we are using */

665

bool match = false;

666

{

667

char *interface = NULL;

668

while((interface=argz_next(mc->interfaces, mc->interfaces_size,

669

interface))){

670

if(if_nametoindex(interface) == (unsigned int)if_index){

671

match = true;

672

break;

673

}

674

}

675

}

676

if(not match){

677

/* This interface does not match any in the list, so we don't

678

connect to the server */

679

if(debug){

680

char interface[IF_NAMESIZE];

681

if(if_indextoname((unsigned int)if_index, interface) == NULL){

682

perror_plus("if_indextoname");

683

} else {

684

fprintf_plus(stderr, "Skipping server on non-used interface"

685

" \"%s\"\n",

686

if_indextoname((unsigned int)if_index,

687

interface));

688

}

689

}

690

return -1;

691

}

692

}

693

694

660

ret = init_gnutls_session(&session, mc);

695

661

if(ret != 0){

696

662

return -1;

1789

1755

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

1790

1756

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

1791

1757

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

1792

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

1793

.interfaces = NULL, .interfaces_size = 0 };

1758

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

1794

1759

AvahiSServiceBrowser *sb = NULL;

1795

1760

error_t ret_errno;

1796

1761

int ret;

1797

1762

intmax_t tmpmax;

1798

1763

char *tmp;

1799

1764

int exitcode = EXIT_SUCCESS;

1765

char *interfaces = NULL;

1766

size_t interfaces_size = 0;

1800

1767

char *interfaces_to_take_down = NULL;

1801

1768

size_t interfaces_to_take_down_size = 0;

1802

1769

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

1902

1869

connect_to = arg;

1903

1870

break;

1904

1871

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

1905

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

1906

arg, (int)',');

1872

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

1873

(int)',');

1907

1874

if(ret_errno != 0){

1908

1875

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

1909

1876

}

2036

2003

}

2037

2004

2038

2005

/* Lower privileges */

2039

lower_privileges();

2006

errno = 0;

2007

ret = seteuid(uid);

2008

if(ret == -1){

2009

perror_plus("seteuid");

2010

}

2040

2011

}

2041

2012

}

2042

2013

2043

/* Remove invalid interface names (except "none") */

2014

/* Remove empty interface names */

2044

2015

{

2045

2016

char *interface = NULL;

2046

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

2017

while((interface = argz_next(interfaces, interfaces_size,

2047

2018

interface))){

2048

if(strcmp(interface, "none") != 0

2049

and if_nametoindex(interface) == 0){

2050

if(interface[0] != '\0'){

2019

if(if_nametoindex(interface) == 0){

2020

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

2051

2021

fprintf_plus(stderr, "Not using nonexisting interface"

2052

2022

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

2053

2023

}

2054

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

2024

argz_delete(&interfaces, &interfaces_size, interface);

2055

2025

interface = NULL;

2056

2026

}

2057

2027

}

2059

2029

2060

2030

/* Run network hooks */

2061

2031

{

2062

if(mc.interfaces != NULL){

2063

interfaces_hooks = malloc(mc.interfaces_size);

2032

2033

if(interfaces != NULL){

2034

interfaces_hooks = malloc(interfaces_size);

2064

2035

if(interfaces_hooks == NULL){

2065

2036

perror_plus("malloc");

2066

2037

goto end;

2067

2038

}

2068

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

2069

interfaces_hooks_size = mc.interfaces_size;

2039

memcpy(interfaces_hooks, interfaces, interfaces_size);

2040

interfaces_hooks_size = interfaces_size;

2070

2041

argz_stringify(interfaces_hooks, interfaces_hooks_size,

2071

2042

(int)',');

2072

2043

}

2156

2127

}

2157

2128

2158

2129

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

2159

if(mc.interfaces == NULL){

2130

if(interfaces == NULL){

2160

2131

struct dirent **direntries;

2161

2132

/* Look for any good interfaces */

2162

2133

ret = scandir(sys_class_net, &direntries, good_interface,

2164

2135

if(ret >= 1){

2165

2136

/* Add all found interfaces to interfaces list */

2166

2137

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

2167

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

2138

ret_errno = argz_add(&interfaces, &interfaces_size,

2168

2139

direntries[i]->d_name);

2169

2140

if(ret_errno != 0){

2170

2141

perror_plus("argz_add");

2184

2155

}

2185

2156

}

2186

2157

2187

/* Bring up interfaces which are down, and remove any "none"s */

2188

{

2158

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

2159

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

2160

if(debug){

2161

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

2162

interfaces);

2163

}

2164

if_index = (AvahiIfIndex)if_nametoindex(interfaces);

2165

}

2166

2167

/* Bring up interfaces which are down */

2168

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

2169

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

2189

2170

char *interface = NULL;

2190

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

2171

while((interface = argz_next(interfaces, interfaces_size,

2191

2172

interface))){

2192

/* If interface name is "none", stop bringing up interfaces.

2193

Also remove all instances of "none" from the list */

2194

if(strcmp(interface, "none") == 0){

2195

argz_delete(&mc.interfaces, &mc.interfaces_size,

2196

interface);

2197

interface = NULL;

2198

while((interface = argz_next(mc.interfaces,

2199

mc.interfaces_size, interface))){

2200

if(strcmp(interface, "none") == 0){

2201

argz_delete(&mc.interfaces, &mc.interfaces_size,

2202

interface);

2203

interface = NULL;

2204

}

2205

}

2206

break;

2207

}

2208

2173

bool interface_was_up = interface_is_up(interface);

2209

2174

ret = bring_up_interface(interface, delay);

2210

2175

if(not interface_was_up){

2218

2183

}

2219

2184

}

2220

2185

}

2186

free(interfaces);

2187

interfaces = NULL;

2188

interfaces_size = 0;

2221

2189

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

2222

2190

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

2223

2191

}

2224

2192

}

2225

2193

2226

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

2227

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

2228

if(debug){

2229

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

2230

mc.interfaces);

2231

}

2232

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

2233

}

2234

2235

2194

if(quit_now){

2236

2195

goto end;

2237

2196

}

2295

2254

exitcode = EX_USAGE;

2296

2255

goto end;

2297

2256

}

2298

2257

2299

2258

if(quit_now){

2300

2259

goto end;

2301

2260

}

2331

2290

fprintf_plus(stderr, "Retrying in %d seconds\n",

2332

2291

(int)retry_interval);

2333

2292

}

2334

sleep((unsigned int)retry_interval);

2293

sleep((int)retry_interval);

2335

2294

}

2336

2295

2337

2296

if (not quit_now){

2410

2369

}

2411

2370

2412

2371

/* Cleanup things */

2413

free(mc.interfaces);

2414

2415

2372

if(sb != NULL)

2416

2373

avahi_s_service_browser_free(sb);

2417

2374

Older »