/mandos/trunk : revision 633

9

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

10

*

11

* Everything else is

12

13

12

13

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

154

155

/* Used for passing in values through the Avahi callback functions */

156

typedef struct {

157

AvahiSimplePoll *simple_poll;

158

157

AvahiServer *server;

159

158

gnutls_certificate_credentials_t cred;

160

159

unsigned int dh_bits;

162

161

const char *priority;

163

162

gpgme_ctx_t ctx;

164

163

server *current_server;

164

char *interfaces;

165

size_t interfaces_size;

165

166

} mandos_context;

166

167

/* global context so signal handler can reach it*/

168

mandos_context mc = { .simple_poll = NULL, .server = NULL,

169

.dh_bits = 1024, .priority = "SECURE256"

170

":!CTYPE-X.509:+CTYPE-OPENPGP",

171

.current_server = NULL };

168

/* global so signal handler can reach it*/

169

AvahiSimplePoll *simple_poll;

172

170

173

171

sig_atomic_t quit_now = 0;

174

172

int signal_received = 0;

189

187

190

188

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

191

189

program_invocation_short_name));

192

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

190

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

193

191

}

194

192

195

193

/*

211

209

212

210

/* Add server to set of servers to retry periodically */

213

211

bool add_server(const char *ip, in_port_t port, AvahiIfIndex if_index,

214

int af){

212

int af, server **current_server){

215

213

int ret;

216

214

server *new_server = malloc(sizeof(server));

217

215

if(new_server == NULL){

227

225

return false;

228

226

}

229

227

/* Special case of first server */

230

if (mc.current_server == NULL){

228

if(*current_server == NULL){

231

229

new_server->next = new_server;

232

230

new_server->prev = new_server;

233

mc.current_server = new_server;

231

*current_server = new_server;

234

232

/* Place the new server last in the list */

235

233

} else {

236

new_server->next = mc.current_server;

237

new_server->prev = mc.current_server->prev;

234

new_server->next = *current_server;

235

new_server->prev = (*current_server)->prev;

238

236

new_server->prev->next = new_server;

239

mc.current_server->prev = new_server;

237

(*current_server)->prev = new_server;

240

238

}

241

ret = clock_gettime(CLOCK_MONOTONIC, &mc.current_server->last_seen);

239

ret = clock_gettime(CLOCK_MONOTONIC, &(*current_server)->last_seen);

242

240

if(ret == -1){

243

241

perror_plus("clock_gettime");

244

242

return false;

250

248

* Initialize GPGME.

251

249

*/

252

250

static bool init_gpgme(const char *seckey, const char *pubkey,

253

const char *tempdir){

251

const char *tempdir, mandos_context *mc){

254

252

gpgme_error_t rc;

255

253

gpgme_engine_info_t engine_info;

256

254

257

258

255

/*

259

256

* Helper function to insert pub and seckey to the engine keyring.

260

257

*/

276

273

return false;

277

274

}

278

275

279

rc = gpgme_op_import(mc.ctx, pgp_data);

276

rc = gpgme_op_import(mc->ctx, pgp_data);

280

277

if(rc != GPG_ERR_NO_ERROR){

281

278

fprintf_plus(stderr, "bad gpgme_op_import: %s: %s\n",

282

279

gpgme_strsource(rc), gpgme_strerror(rc));

326

323

}

327

324

328

325

/* Create new GPGME "context" */

329

rc = gpgme_new(&(mc.ctx));

326

rc = gpgme_new(&(mc->ctx));

330

327

if(rc != GPG_ERR_NO_ERROR){

331

328

fprintf_plus(stderr, "Mandos plugin mandos-client: "

332

329

"bad gpgme_new: %s: %s\n", gpgme_strsource(rc),

347

344

*/

348

345

static ssize_t pgp_packet_decrypt(const char *cryptotext,

349

346

size_t crypto_size,

350

char **plaintext){

347

char **plaintext,

348

mandos_context *mc){

351

349

gpgme_data_t dh_crypto, dh_plain;

352

350

gpgme_error_t rc;

353

351

ssize_t ret;

379

377

380

378

/* Decrypt data from the cryptotext data buffer to the plaintext

381

379

data buffer */

382

rc = gpgme_op_decrypt(mc.ctx, dh_crypto, dh_plain);

380

rc = gpgme_op_decrypt(mc->ctx, dh_crypto, dh_plain);

383

381

if(rc != GPG_ERR_NO_ERROR){

384

382

fprintf_plus(stderr, "bad gpgme_op_decrypt: %s: %s\n",

385

383

gpgme_strsource(rc), gpgme_strerror(rc));

386

384

plaintext_length = -1;

387

385

if(debug){

388

386

gpgme_decrypt_result_t result;

389

result = gpgme_op_decrypt_result(mc.ctx);

387

result = gpgme_op_decrypt_result(mc->ctx);

390

388

if(result == NULL){

391

389

fprintf_plus(stderr, "gpgme_op_decrypt_result failed\n");

392

390

} else {

483

481

}

484

482

485

483

static int init_gnutls_global(const char *pubkeyfilename,

486

const char *seckeyfilename){

484

const char *seckeyfilename,

485

mandos_context *mc){

487

486

int ret;

488

487

489

488

if(debug){

506

505

}

507

506

508

507

/* OpenPGP credentials */

509

ret = gnutls_certificate_allocate_credentials(&mc.cred);

508

ret = gnutls_certificate_allocate_credentials(&mc->cred);

510

509

if(ret != GNUTLS_E_SUCCESS){

511

510

fprintf_plus(stderr, "GnuTLS memory error: %s\n",

512

511

safer_gnutls_strerror(ret));

522

521

}

523

522

524

523

ret = gnutls_certificate_set_openpgp_key_file

525

(mc.cred, pubkeyfilename, seckeyfilename,

524

(mc->cred, pubkeyfilename, seckeyfilename,

526

525

GNUTLS_OPENPGP_FMT_BASE64);

527

526

if(ret != GNUTLS_E_SUCCESS){

528

527

fprintf_plus(stderr,

534

533

}

535

534

536

535

/* GnuTLS server initialization */

537

ret = gnutls_dh_params_init(&mc.dh_params);

536

ret = gnutls_dh_params_init(&mc->dh_params);

538

537

if(ret != GNUTLS_E_SUCCESS){

539

538

fprintf_plus(stderr, "Error in GnuTLS DH parameter"

540

539

" initialization: %s\n",

541

540

safer_gnutls_strerror(ret));

542

541

goto globalfail;

543

542

}

544

ret = gnutls_dh_params_generate2(mc.dh_params, mc.dh_bits);

543

ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits);

545

544

if(ret != GNUTLS_E_SUCCESS){

546

545

fprintf_plus(stderr, "Error in GnuTLS prime generation: %s\n",

547

546

safer_gnutls_strerror(ret));

548

547

goto globalfail;

549

548

}

550

549

551

gnutls_certificate_set_dh_params(mc.cred, mc.dh_params);

550

gnutls_certificate_set_dh_params(mc->cred, mc->dh_params);

552

551

553

552

return 0;

554

553

555

554

globalfail:

556

555

557

gnutls_certificate_free_credentials(mc.cred);

556

gnutls_certificate_free_credentials(mc->cred);

558

557

gnutls_global_deinit();

559

gnutls_dh_params_deinit(mc.dh_params);

558

gnutls_dh_params_deinit(mc->dh_params);

560

559

return -1;

561

560

}

562

561

563

static int init_gnutls_session(gnutls_session_t *session){

562

static int init_gnutls_session(gnutls_session_t *session,

563

mandos_context *mc){

564

int ret;

565

/* GnuTLS session creation */

566

do {

578

{

579

const char *err;

580

do {

581

ret = gnutls_priority_set_direct(*session, mc.priority, &err);

581

ret = gnutls_priority_set_direct(*session, mc->priority, &err);

582

if(quit_now){

583

gnutls_deinit(*session);

584

return -1;

595

596

do {

597

ret = gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE,

598

mc.cred);

598

mc->cred);

599

if(quit_now){

600

gnutls_deinit(*session);

601

return -1;

611

/* ignore client certificate if any. */

612

gnutls_certificate_server_set_request(*session, GNUTLS_CERT_IGNORE);

613

614

gnutls_dh_set_prime_bits(*session, mc.dh_bits);

614

gnutls_dh_set_prime_bits(*session, mc->dh_bits);

615

616

return 0;

617

}

623

/* Called when a Mandos server is found */

624

static int start_mandos_communication(const char *ip, in_port_t port,

625

AvahiIfIndex if_index,

626

int af){

626

int af, mandos_context *mc){

627

int ret, tcp_sd = -1;

628

ssize_t sret;

629

union {

659

return -1;

660

}

661

662

ret = init_gnutls_session(&session);

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

ret = init_gnutls_session(&session, mc);

663

695

if(ret != 0){

664

696

return -1;

665

697

}

937

969

if(buffer_length > 0){

938

970

ssize_t decrypted_buffer_size;

939

971

decrypted_buffer_size = pgp_packet_decrypt(buffer, buffer_length,

940

&decrypted_buffer);

972

&decrypted_buffer, mc);

941

973

if(decrypted_buffer_size >= 0){

942

974

943

975

written = 0;

1004

1036

AVAHI_GCC_UNUSED AvahiStringList *txt,

1005

1037

AVAHI_GCC_UNUSED AvahiLookupResultFlags

1006

1038

flags,

1007

AVAHI_GCC_UNUSED void* userdata){

1039

void* mc){

1008

1040

if(r == NULL){

1009

1041

return;

1010

1042

}

1022

1054

fprintf_plus(stderr, "(Avahi Resolver) Failed to resolve service "

1023

1055

"'%s' of type '%s' in domain '%s': %s\n", name, type,

1024

1056

domain,

1025

avahi_strerror(avahi_server_errno(mc.server)));

1057

avahi_strerror(avahi_server_errno

1058

(((mandos_context*)mc)->server)));

1026

1059

break;

1027

1060

1028

1061

case AVAHI_RESOLVER_FOUND:

1036

1069

}

1037

1070

int ret = start_mandos_communication(ip, (in_port_t)port,

1038

1071

interface,

1039

avahi_proto_to_af(proto));

1072

avahi_proto_to_af(proto),

1073

mc);

1040

1074

if(ret == 0){

1041

avahi_simple_poll_quit(mc.simple_poll);

1075

avahi_simple_poll_quit(simple_poll);

1042

1076

} else {

1043

1077

if(not add_server(ip, (in_port_t)port, interface,

1044

avahi_proto_to_af(proto))){

1078

avahi_proto_to_af(proto),

1079

&((mandos_context*)mc)->current_server)){

1045

1080

fprintf_plus(stderr, "Failed to add server \"%s\" to server"

1046

1081

" list\n", name);

1047

1082

}

1060

1095

const char *domain,

1061

1096

AVAHI_GCC_UNUSED AvahiLookupResultFlags

1062

1097

flags,

1063

AVAHI_GCC_UNUSED void* userdata){

1098

void* mc){

1064

1099

if(b == NULL){

1065

1100

return;

1066

1101

}

1077

1112

case AVAHI_BROWSER_FAILURE:

1078

1113

1079

1114

fprintf_plus(stderr, "(Avahi browser) %s\n",

1080

avahi_strerror(avahi_server_errno(mc.server)));

1081

avahi_simple_poll_quit(mc.simple_poll);

1115

avahi_strerror(avahi_server_errno

1116

(((mandos_context*)mc)->server)));

1117

avahi_simple_poll_quit(simple_poll);

1082

1118

return;

1083

1119

1084

1120

case AVAHI_BROWSER_NEW:

1087

1123

the callback function is called the Avahi server will free the

1088

1124

resolver for us. */

1089

1125

1090

if(avahi_s_service_resolver_new(mc.server, interface, protocol,

1091

name, type, domain, protocol, 0,

1092

resolve_callback, NULL) == NULL)

1126

if(avahi_s_service_resolver_new(((mandos_context*)mc)->server,

1127

interface, protocol, name, type,

1128

domain, protocol, 0,

1129

resolve_callback, mc) == NULL)

1093

1130

fprintf_plus(stderr, "Avahi: Failed to resolve service '%s':"

1094

1131

" %s\n", name,

1095

avahi_strerror(avahi_server_errno(mc.server)));

1132

avahi_strerror(avahi_server_errno

1133

(((mandos_context*)mc)->server)));

1096

1134

break;

1097

1135

1098

1136

case AVAHI_BROWSER_REMOVE:

1117

1155

signal_received = sig;

1118

1156

int old_errno = errno;

1119

1157

/* set main loop to exit */

1120

if(mc.simple_poll != NULL){

1121

avahi_simple_poll_quit(mc.simple_poll);

1158

if(simple_poll != NULL){

1159

avahi_simple_poll_quit(simple_poll);

1122

1160

}

1123

1161

errno = old_errno;

1124

1162

}

1318

1356

return 1;

1319

1357

}

1320

1358

1321

int avahi_loop_with_timeout(AvahiSimplePoll *s, int retry_interval){

1359

int avahi_loop_with_timeout(AvahiSimplePoll *s, int retry_interval,

1360

mandos_context *mc){

1322

1361

int ret;

1323

1362

struct timespec now;

1324

1363

struct timespec waited_time;

1325

1364

intmax_t block_time;

1326

1365

1327

1366

while(true){

1328

if(mc.current_server == NULL){

1367

if(mc->current_server == NULL){

1329

1368

if (debug){

1330

1369

fprintf_plus(stderr, "Wait until first server is found."

1331

1370

" No timeout!\n");

1345

1384

/* Calculating in ms how long time between now and server

1346

1385

who we visted longest time ago. Now - last seen. */

1347

1386

waited_time.tv_sec = (now.tv_sec

1348

- mc.current_server->last_seen.tv_sec);

1387

- mc->current_server->last_seen.tv_sec);

1349

1388

waited_time.tv_nsec = (now.tv_nsec

1350

- mc.current_server->last_seen.tv_nsec);

1389

- mc->current_server->last_seen.tv_nsec);

1351

1390

/* total time is 10s/10,000ms.

1352

1391

Converting to s from ms by dividing by 1,000,

1353

1392

and ns to ms by dividing by 1,000,000. */

1361

1400

}

1362

1401

1363

1402

if(block_time <= 0){

1364

ret = start_mandos_communication(mc.current_server->ip,

1365

mc.current_server->port,

1366

mc.current_server->if_index,

1367

mc.current_server->af);

1403

ret = start_mandos_communication(mc->current_server->ip,

1404

mc->current_server->port,

1405

mc->current_server->if_index,

1406

mc->current_server->af, mc);

1368

1407

if(ret == 0){

1369

avahi_simple_poll_quit(mc.simple_poll);

1408

avahi_simple_poll_quit(s);

1370

1409

return 0;

1371

1410

}

1372

1411

ret = clock_gettime(CLOCK_MONOTONIC,

1373

&mc.current_server->last_seen);

1412

&mc->current_server->last_seen);

1374

1413

if(ret == -1){

1375

1414

perror_plus("clock_gettime");

1376

1415

return -1;

1377

1416

}

1378

mc.current_server = mc.current_server->next;

1417

mc->current_server = mc->current_server->next;

1379

1418

block_time = 0; /* Call avahi to find new Mandos

1380

1419

servers, but don't block */

1381

1420

}

1748

1787

}

1749

1788

1750

1789

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

1790

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

1791

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

1792

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

1793

.interfaces = NULL, .interfaces_size = 0 };

1751

1794

AvahiSServiceBrowser *sb = NULL;

1752

1795

error_t ret_errno;

1753

1796

int ret;

1754

1797

intmax_t tmpmax;

1755

1798

char *tmp;

1756

1799

int exitcode = EXIT_SUCCESS;

1757

char *interfaces = NULL;

1758

size_t interfaces_size = 0;

1759

1800

char *interfaces_to_take_down = NULL;

1760

1801

size_t interfaces_to_take_down_size = 0;

1761

1802

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

1861

1902

connect_to = arg;

1862

1903

break;

1863

1904

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

1864

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

1865

(int)',');

1905

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

1906

arg, (int)',');

1866

1907

if(ret_errno != 0){

1867

1908

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

1868

1909

}

1995

2036

}

1996

2037

1997

2038

/* Lower privileges */

1998

errno = 0;

1999

ret = seteuid(uid);

2000

if(ret == -1){

2001

perror_plus("seteuid");

2002

}

2039

lower_privileges();

2003

2040

}

2004

2041

}

2005

2042

2006

/* Remove empty interface names */

2043

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

2007

2044

{

2008

2045

char *interface = NULL;

2009

while((interface = argz_next(interfaces, interfaces_size,

2046

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

2010

2047

interface))){

2011

if(if_nametoindex(interface) == 0){

2012

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

2048

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

2049

and if_nametoindex(interface) == 0){

2050

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

2013

2051

fprintf_plus(stderr, "Not using nonexisting interface"

2014

2052

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

2015

2053

}

2016

argz_delete(&interfaces, &interfaces_size, interface);

2054

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

2017

2055

interface = NULL;

2018

2056

}

2019

2057

}

2021

2059

2022

2060

/* Run network hooks */

2023

2061

{

2024

2025

if(interfaces != NULL){

2026

interfaces_hooks = malloc(interfaces_size);

2062

if(mc.interfaces != NULL){

2063

interfaces_hooks = malloc(mc.interfaces_size);

2027

2064

if(interfaces_hooks == NULL){

2028

2065

perror_plus("malloc");

2029

2066

goto end;

2030

2067

}

2031

memcpy(interfaces_hooks, interfaces, interfaces_size);

2032

interfaces_hooks_size = interfaces_size;

2068

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

2069

interfaces_hooks_size = mc.interfaces_size;

2033

2070

argz_stringify(interfaces_hooks, interfaces_hooks_size,

2034

2071

(int)',');

2035

2072

}

2047

2084

from the signal handler */

2048

2085

/* Initialize the pseudo-RNG for Avahi */

2049

2086

srand((unsigned int) time(NULL));

2050

mc.simple_poll = avahi_simple_poll_new();

2051

if(mc.simple_poll == NULL){

2087

simple_poll = avahi_simple_poll_new();

2088

if(simple_poll == NULL){

2052

2089

fprintf_plus(stderr,

2053

2090

"Avahi: Failed to create simple poll object.\n");

2054

2091

exitcode = EX_UNAVAILABLE;

2119

2156

}

2120

2157

2121

2158

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

2122

if(interfaces == NULL){

2159

if(mc.interfaces == NULL){

2123

2160

struct dirent **direntries;

2124

2161

/* Look for any good interfaces */

2125

2162

ret = scandir(sys_class_net, &direntries, good_interface,

2127

2164

if(ret >= 1){

2128

2165

/* Add all found interfaces to interfaces list */

2129

2166

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

2130

ret_errno = argz_add(&interfaces, &interfaces_size,

2167

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

2131

2168

direntries[i]->d_name);

2132

2169

if(ret_errno != 0){

2133

2170

perror_plus("argz_add");

2147

2184

}

2148

2185

}

2149

2186

2150

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

2151

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

2152

if(debug){

2153

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

2154

interfaces);

2155

}

2156

if_index = (AvahiIfIndex)if_nametoindex(interfaces);

2157

}

2158

2159

/* Bring up interfaces which are down */

2160

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

2161

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

2187

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

2188

{

2162

2189

char *interface = NULL;

2163

while((interface = argz_next(interfaces, interfaces_size,

2190

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

2164

2191

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

}

2165

2208

bool interface_was_up = interface_is_up(interface);

2166

2209

ret = bring_up_interface(interface, delay);

2167

2210

if(not interface_was_up){

2175

2218

}

2176

2219

}

2177

2220

}

2178

free(interfaces);

2179

interfaces = NULL;

2180

interfaces_size = 0;

2181

2221

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

2182

2222

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

2183

2223

}

2184

2224

}

2185

2225

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

2186

2235

if(quit_now){

2187

2236

goto end;

2188

2237

}

2189

2238

2190

ret = init_gnutls_global(pubkey, seckey);

2239

ret = init_gnutls_global(pubkey, seckey, &mc);

2191

2240

if(ret == -1){

2192

2241

fprintf_plus(stderr, "init_gnutls_global failed\n");

2193

2242

exitcode = EX_UNAVAILABLE;

2210

2259

goto end;

2211

2260

}

2212

2261

2213

if(not init_gpgme(pubkey, seckey, tempdir)){

2262

if(not init_gpgme(pubkey, seckey, tempdir, &mc)){

2214

2263

fprintf_plus(stderr, "init_gpgme failed\n");

2215

2264

exitcode = EX_UNAVAILABLE;

2216

2265

goto end;

2246

2295

exitcode = EX_USAGE;

2247

2296

goto end;

2248

2297

}

2249

2298

2250

2299

if(quit_now){

2251

2300

goto end;

2252

2301

}

2273

2322

}

2274

2323

2275

2324

while(not quit_now){

2276

ret = start_mandos_communication(address, port, if_index, af);

2325

ret = start_mandos_communication(address, port, if_index, af,

2326

&mc);

2277

2327

if(quit_now or ret == 0){

2278

2328

break;

2279

2329

}

2281

2331

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

2282

2332

(int)retry_interval);

2283

2333

}

2284

sleep((int)retry_interval);

2334

sleep((unsigned int)retry_interval);

2285

2335

}

2286

2336

2287

2337

if (not quit_now){

2305

2355

config.publish_domain = 0;

2306

2356

2307

2357

/* Allocate a new server */

2308

mc.server = avahi_server_new(avahi_simple_poll_get

2309

(mc.simple_poll), &config, NULL,

2310

NULL, &ret_errno);

2358

mc.server = avahi_server_new(avahi_simple_poll_get(simple_poll),

2359

&config, NULL, NULL, &ret_errno);

2311

2360

2312

2361

/* Free the Avahi configuration data */

2313

2362

avahi_server_config_free(&config);

2328

2377

/* Create the Avahi service browser */

2329

2378

sb = avahi_s_service_browser_new(mc.server, if_index,

2330

2379

AVAHI_PROTO_UNSPEC, "_mandos._tcp",

2331

NULL, 0, browse_callback, NULL);

2380

NULL, 0, browse_callback,

2381

(void *)&mc);

2332

2382

if(sb == NULL){

2333

2383

fprintf_plus(stderr, "Failed to create service browser: %s\n",

2334

2384

avahi_strerror(avahi_server_errno(mc.server)));

2346

2396

fprintf_plus(stderr, "Starting Avahi loop search\n");

2347

2397

}

2348

2398

2349

ret = avahi_loop_with_timeout(mc.simple_poll,

2350

(int)(retry_interval * 1000));

2399

ret = avahi_loop_with_timeout(simple_poll,

2400

(int)(retry_interval * 1000), &mc);

2351

2401

if(debug){

2352

2402

fprintf_plus(stderr, "avahi_loop_with_timeout exited %s\n",

2353

2403

(ret == 0) ? "successfully" : "with error");

2360

2410

}

2361

2411

2362

2412

/* Cleanup things */

2413

free(mc.interfaces);

2414

2363

2415

if(sb != NULL)

2364

2416

avahi_s_service_browser_free(sb);

2365

2417

2366

2418

if(mc.server != NULL)

2367

2419

avahi_server_free(mc.server);

2368

2420

2369

if(mc.simple_poll != NULL)

2370

avahi_simple_poll_free(mc.simple_poll);

2421

if(simple_poll != NULL)

2422

avahi_simple_poll_free(simple_poll);

2371

2423

2372

2424

if(gnutls_initialized){

2373

2425

gnutls_certificate_free_credentials(mc.cred);