/mandos/release : revision 237.7.215

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/mandos-client.c

Committer: Teddy Hogeborn
Date: 2014-03-09 03:02:43 UTC
mto: (237.7.272 trunk)
mto: This revision was merged to the branch mainline in revision 311.
Revision ID: teddy@recompile.se-20140309030243-0gc6l2yuqbzgyuyt

Use getnameinfo() instead of inet_ntop() in mandos-client.

* plugins.d/mandos-client.c (start_mandos_communication): Use
                                                          getnameinfo()
                                                          instead of
                                                          inet_ntop().

Show diffs side-by-side

added added

removed removed

plugins.d/mandos-client.c

opendir(), DIR */

#include <sys/stat.h> /* open(), S_ISREG */

#include <sys/socket.h> /* socket(), struct sockaddr_in6,

inet_pton(), connect() */

inet_pton(), connect(),

getnameinfo() */

#include <fcntl.h> /* open() */

#include <dirent.h> /* opendir(), struct dirent, readdir()

#include <unistd.h> /* close(), SEEK_SET, off_t, write(),

getuid(), getgid(), seteuid(),

setgid(), pause(), _exit() */

#include <arpa/inet.h> /* inet_pton(), htons, inet_ntop() */

#include <arpa/inet.h> /* inet_pton(), htons() */

#include <iso646.h> /* not, or, and */

#include <argp.h> /* struct argp_option, error_t, struct

argp_state, struct argp,

argz_delete(), argz_append(),

argz_stringify(), argz_add(),

argz_count() */

#include <netdb.h> /* getnameinfo(), NI_NUMERICHOST,

EAI_SYSTEM, gai_strerror() */

#ifdef __linux__

#include <sys/klog.h> /* klogctl() */

198

201

size_t incbuffer(char **buffer, size_t buffer_length,

199

202

size_t buffer_capacity){

200

203

if(buffer_length + BUFFER_SIZE > buffer_capacity){

201

*buffer = realloc(*buffer, buffer_capacity + BUFFER_SIZE);

202

if(buffer == NULL){

204

char *new_buf = realloc(*buffer, buffer_capacity + BUFFER_SIZE);

205

if(new_buf == NULL){

206

int old_errno = errno;

207

free(*buffer);

208

errno = old_errno;

209

*buffer = NULL;

203

210

return 0;

204

211

}

212

*buffer = new_buf;

205

213

buffer_capacity += BUFFER_SIZE;

206

214

}

207

215

return buffer_capacity;

736

744

}

737

745

if(af == AF_INET6){

738

746

to.in6.sin6_port = htons(port);

747

#ifdef __GNUC__

748

#pragma GCC diagnostic push

749

#pragma GCC diagnostic ignored "-Wstrict-aliasing"

750

#endif

739

751

if(IN6_IS_ADDR_LINKLOCAL /* Spurious warnings from */

740

(&to.in6.sin6_addr)){ /* -Wstrict-aliasing=2 or lower and

741

-Wunreachable-code*/

752

(&to.in6.sin6_addr)){ /* -Wstrict-aliasing=2 or lower */

753

#ifdef __GNUC__

754

#pragma GCC diagnostic pop

755

#endif

742

756

if(if_index == AVAHI_IF_UNSPEC){

743

757

fprintf_plus(stderr, "An IPv6 link-local address is"

744

758

" incomplete without a network interface\n");

749

763

to.in6.sin6_scope_id = (uint32_t)if_index;

750

764

}

751

765

} else {

752

to.in.sin_port = htons(port); /* Spurious warnings from

753

-Wconversion and

754

-Wunreachable-code */

766

to.in.sin_port = htons(port);

755

767

}

756

768

757

769

if(quit_now){

774

786

}

775

787

char addrstr[(INET_ADDRSTRLEN > INET6_ADDRSTRLEN) ?

776

788

INET_ADDRSTRLEN : INET6_ADDRSTRLEN] = "";

777

const char *pcret;

778

789

if(af == AF_INET6){

779

pcret = inet_ntop(af, &(to.in6.sin6_addr), addrstr,

780

sizeof(addrstr));

790

ret = getnameinfo((struct sockaddr *)&(to.in6), sizeof(to.in6),

791

addrstr, sizeof(addrstr), NULL, 0,

792

NI_NUMERICHOST);

781

793

} else {

782

pcret = inet_ntop(af, &(to.in.sin_addr), addrstr,

783

sizeof(addrstr));

794

ret = getnameinfo((struct sockaddr *)&(to.in), sizeof(to.in),

795

addrstr, sizeof(addrstr), NULL, 0,

796

NI_NUMERICHOST);

784

797

}

785

if(pcret == NULL){

786

perror_plus("inet_ntop");

787

} else {

788

if(strcmp(addrstr, ip) != 0){

789

fprintf_plus(stderr, "Canonical address form: %s\n", addrstr);

790

}

798

if(ret == EAI_SYSTEM){

799

perror_plus("getnameinfo");

800

} else if(ret != 0) {

801

fprintf_plus(stderr, "getnameinfo: %s", gai_strerror(ret));

802

} else if(strcmp(addrstr, ip) != 0){

803

fprintf_plus(stderr, "Canonical address form: %s\n", addrstr);

791

804

}

792

805

}

793

806

1484

1497

bool run_network_hooks(const char *mode, const char *interface,

1485

1498

const float delay){

1486

1499

struct dirent **direntries;

1487

struct dirent *direntry;

1488

int ret;

1489

1500

int numhooks = scandir(hookdir, &direntries, runnable_hook,

1490

1501

alphasort);

1491

1502

if(numhooks == -1){

1498

1509

perror_plus("scandir");

1499

1510

}

1500

1511

} else {

1512

struct dirent *direntry;

1513

int ret;

1501

1514

int devnull = open("/dev/null", O_RDONLY);

1502

1515

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

1503

1516

direntry = direntries[i];

1723

1736

}

1724

1737

1725

1738

error_t take_down_interface(const char *const interface){

1726

int sd = -1;

1727

1739

error_t old_errno = errno;

1728

error_t ret_errno = 0;

1729

int ret, ret_setflags;

1730

1740

struct ifreq network;

1731

1741

unsigned int if_index = if_nametoindex(interface);

1732

1742

if(if_index == 0){

1735

1745

return ENXIO;

1736

1746

}

1737

1747

if(interface_is_up(interface)){

1748

error_t ret_errno = 0;

1738

1749

if(not get_flags(interface, &network) and debug){

1739

1750

ret_errno = errno;

1740

1751

fprintf_plus(stderr, "Failed to get flags for interface "

1743

1754

}

1744

1755

network.ifr_flags &= ~(short)IFF_UP; /* clear flag */

1745

1756

1746

sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);

1757

int sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);

1747

1758

if(sd < 0){

1748

1759

ret_errno = errno;

1749

1760

perror_plus("socket");

1759

1770

/* Raise priviliges */

1760

1771

raise_privileges();

1761

1772

1762

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

1773

int ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network);

1763

1774

ret_errno = errno;

1764

1775

1765

1776

/* Lower privileges */

1766

1777

lower_privileges();

1767

1778

1768

1779

/* Close the socket */

1769

ret = (int)TEMP_FAILURE_RETRY(close(sd));

1780

int ret = (int)TEMP_FAILURE_RETRY(close(sd));

1770

1781

if(ret == -1){

1771

1782

perror_plus("close");

1772

1783

}

1805

1816

const char *seckey = PATHDIR "/" SECKEY;

1806

1817

const char *pubkey = PATHDIR "/" PUBKEY;

1807

1818

char *interfaces_hooks = NULL;

1808

size_t interfaces_hooks_size = 0;

1809

1819

1810

1820

bool gnutls_initialized = false;

1811

1821

bool gpgme_initialized = false;

2066

2076

goto end;

2067

2077

}

2068

2078

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

2069

interfaces_hooks_size = mc.interfaces_size;

2070

argz_stringify(interfaces_hooks, interfaces_hooks_size,

2071

(int)',');

2079

argz_stringify(interfaces_hooks, mc.interfaces_size, (int)',');

2072

2080

}

2073

2081

if(not run_network_hooks("start", interfaces_hooks != NULL ?

2074

2082

interfaces_hooks : "", delay)){

2167

2175

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

2168

2176

direntries[i]->d_name);

2169

2177

if(ret_errno != 0){

2178

errno = ret_errno;

2170

2179

perror_plus("argz_add");

2171

2180

continue;

2172

2181

}

2215

2224

ret_errno = argz_add(&interfaces_to_take_down,

2216

2225

&interfaces_to_take_down_size,

2217

2226

interface);

2227

if(ret_errno != 0){

2228

errno = ret_errno;

2229

perror_plus("argz_add");

2230

}

2218

2231

}

2219

2232

}

2220

2233

}

Older »