Preston_PLB
/
sngrep
forked from Mirrors/sngrep
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' into experimental

This commit is contained in:
Kaian 2016-02-04 13:01:04 +01:00
parent 91f654ea8d b1f3f722b4
commit aad9bb19bf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/capture.c
View File

@ -74,7 +74,7 @@ capture_init(size_t limit, bool rtp_capture)
// Initialize calls lock
pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__FreeBSD__) || defined(BSD) || defined (__OpenBSD__)
#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__FreeBSD__) || defined(BSD) || defined (__OpenBSD__) || defined(__DragonFly__)
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
#else
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
@ -848,7 +848,7 @@ capture_set_keyfile(const char *keyfile)
}
char *
capture_last_error(cap)
capture_last_error()
{
capture_info_t *capinfo;
if (vector_count(capture_cfg.sources) == 1) {

4
src/capture_eep.c
View File

@ -342,13 +342,13 @@ capture_eep_send_v3(packet_t *pkt)
src_ip6.chunk.vendor_id = htons(0x0000);
src_ip6.chunk.type_id = htons(0x0005);
inet_pton(AF_INET6, pkt->src.ip, &src_ip6.data);
src_ip6.chunk.length = htonl(sizeof(src_ip6));
src_ip6.chunk.length = htons(sizeof(src_ip6));
/* DST IPv6 */
dst_ip6.chunk.vendor_id = htons(0x0000);
dst_ip6.chunk.type_id = htons(0x0006);
inet_pton(AF_INET6, pkt->dst.ip, &dst_ip6.data);
dst_ip6.chunk.length = htonl(sizeof(dst_ip6));
dst_ip6.chunk.length = htons(sizeof(dst_ip6));
iplen = sizeof(dst_ip6) + sizeof(src_ip6);
}