/mandos/release : revision 36

To get this branch, use:

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

« back to all changes in this revision

Viewing changes to plugins.d/mandosclient.c

Committer: Teddy Hogeborn
Date: 2008-08-02 14:33:47 UTC
Revision ID: teddy@fukt.bsnet.se-20080802143347-u1m4zs1q0feu72ei

* TODO: Converted to org-mode style

* plugins.d/mandosclient.c (certdir): Changed to "/conf/conf.d/mandos/".
  (certdir, certfile, certkey, pgp_packet_decrypt, debuggnutls,
  initgnutls, empty_log, combinepath): Made static.
  (combinepath): Rewritten to only get the argument string lengths
                 once.  Do not print error message; leave that to
                 caller.  All callers changed.

files modified:
plugbasedclient.c

plugins.d/mandosclient.c

Show diffs side-by-side

added added

removed removed

plugins.d/mandosclient.c

#include <stdlib.h>

#include <time.h>

#include <net/if.h> /* if_nametoindex */

#include <sys/ioctl.h> // ioctl, ifreq, SIOCGIFFLAGS, IFF_UP, SIOCSIFFLAGS

#include <net/if.h> // ioctl, ifreq, SIOCGIFFLAGS, IFF_UP, SIOCSIFFLAGS

#include <avahi-core/core.h>

#include <avahi-core/lookup.h>

374

372

perror("socket");

375

373

return -1;

376

374

}

377

375

376

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

377

if(debug){

378

perror("if_indextoname");

379

}

380

return -1;

381

}

382

378

383

if(debug){

379

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

380

if(debug){

381

perror("if_indextoname");

382

}

383

return -1;

384

}

385

386

384

fprintf(stderr, "Binding to interface %s\n", interface);

387

385

}

388

386

657

655

int error;

658

656

int ret;

659

657

int returncode = EXIT_SUCCESS;

660

const char *interface = "eth0";

661

struct ifreq network;

662

int sd;

658

const char *interface = NULL;

659

AvahiIfIndex if_index = AVAHI_IF_UNSPEC;

663

660

char *connect_to = NULL;

664

AvahiIfIndex if_index = AVAHI_IF_UNSPEC;

665

661

666

662

while (true){

667

663

static struct option long_options[] = {

707

703

certfile = combinepath(certdir, certfile);

708

704

if (certfile == NULL){

709

705

perror("combinepath");

710

returncode = EXIT_FAILURE;

711

goto exit;

712

}

713

714

certkey = combinepath(certdir, certkey);

715

if (certkey == NULL){

716

perror("combinepath");

717

returncode = EXIT_FAILURE;

718

706

goto exit;

719

707

}

720

708

721

if_index = (AvahiIfIndex) if_nametoindex(interface);

722

if(if_index == 0){

723

fprintf(stderr, "No such interface: \"%s\"\n", interface);

724

exit(EXIT_FAILURE);

709

if(interface != NULL){

710

if_index = (AvahiIfIndex) if_nametoindex(interface);

711

if(if_index == 0){

712

fprintf(stderr, "No such interface: \"%s\"\n", interface);

713

exit(EXIT_FAILURE);

714

}

725

715

}

726

716

727

717

if(connect_to != NULL){

748

738

}

749

739

}

750

740

751

sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);

752

if(sd < 0) {

753

perror("socket");

754

returncode = EXIT_FAILURE;

755

goto exit;

756

}

757

strcpy(network.ifr_name, interface);

758

ret = ioctl(sd, SIOCGIFFLAGS, &network);

759

if(ret == -1){

760

761

perror("ioctl SIOCGIFFLAGS");

762

returncode = EXIT_FAILURE;

763

goto exit;

764

}

765

if((network.ifr_flags & IFF_UP) == 0){

766

network.ifr_flags |= IFF_UP;

767

ret = ioctl(sd, SIOCSIFFLAGS, &network);

768

if(ret == -1){

769

perror("ioctl SIOCSIFFLAGS");

770

returncode = EXIT_FAILURE;

771

goto exit;

772

}

773

}

774

close(sd);

741

certkey = combinepath(certdir, certkey);

742

if (certkey == NULL){

743

perror("combinepath");

744

goto exit;

745

}

775

746

776

747

if (not debug){

777

748

avahi_set_log_function(empty_log);

783

754

/* Allocate main loop object */

784

755

if (!(simple_poll = avahi_simple_poll_new())) {

785

756

fprintf(stderr, "Failed to create simple poll object.\n");

786

returncode = EXIT_FAILURE;

757

787

758

goto exit;

788

759

}

789

760

Older »