diff options
| author | Ghasem Naddaf <ghasem.naddaf@gmail.com> | 2020-03-11 09:50:54 -0700 |
|---|---|---|
| committer | Ghasem Naddaf <ghasem.naddaf@gmail.com> | 2020-03-11 09:50:54 -0700 |
| commit | 31384f929ad817f5a6459feeb6f27ff292b35e2f (patch) | |
| tree | 9072ac9757649e446f8018f44379c8068e1bfa23 /lib/sockopt.c | |
| parent | 912c556b3a0354f37328f52108777e434307e339 (diff) | |
| parent | 4a652d922754bfb9e4216347cfc6ea59d068b800 (diff) | |
Merge branch 'master' into nhrp_bugfix
Diffstat (limited to 'lib/sockopt.c')
| -rw-r--r-- | lib/sockopt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/sockopt.c b/lib/sockopt.c index d6c88c0aff..45d9008796 100644 --- a/lib/sockopt.c +++ b/lib/sockopt.c @@ -90,12 +90,11 @@ int getsockopt_so_recvbuf(const int sock) static void *getsockopt_cmsg_data(struct msghdr *msgh, int level, int type) { struct cmsghdr *cmsg; - void *ptr = NULL; for (cmsg = CMSG_FIRSTHDR(msgh); cmsg != NULL; cmsg = CMSG_NXTHDR(msgh, cmsg)) if (cmsg->cmsg_level == level && cmsg->cmsg_type == type) - return (ptr = CMSG_DATA(cmsg)); + return CMSG_DATA(cmsg); return NULL; } @@ -684,7 +683,7 @@ int sockopt_tcp_signature_ext(int sock, union sockunion *su, uint16_t prefixlen, #endif /* GNU_LINUX */ if ((ret = setsockopt(sock, IPPROTO_TCP, optname, &md5sig, - sizeof md5sig)) + sizeof(md5sig))) < 0) { /* ENOENT is harmless. It is returned when we clear a password for which |