dropbear: cherry-pick upstream patches
[openwrt/staging/robimarko.git] / package / network / services / dropbear / patches / 012-add-ifdef-guards-for-SO_BINDTODEVICE.patch
1 From 031d09b47912b2401f4934667c0b6f857ede61ee Mon Sep 17 00:00:00 2001
2 From: Matt Johnston <matt@ucc.asn.au>
3 Date: Tue, 18 Jul 2023 23:20:16 +0800
4 Subject: Add ifdef guards for SO_BINDTODEVICE
5
6 ---
7 netio.c | 2 ++
8 svr-runopts.c | 4 ++++
9 2 files changed, 6 insertions(+)
10
11 --- a/netio.c
12 +++ b/netio.c
13 @@ -555,10 +555,12 @@ int dropbear_listen(const char* address,
14 /* set to reuse, quick timeout */
15 setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &val, sizeof(val));
16
17 +#ifdef SO_BINDTODEVICE
18 if(interface && setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, interface, strlen(interface)) < 0) {
19 dropbear_log(LOG_WARNING, "Couldn't set SO_BINDTODEVICE");
20 TRACE(("Failed setsockopt with errno failure, %d %s", errno, strerror(errno)))
21 }
22 +#endif
23
24 #if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
25 if (res->ai_family == AF_INET6) {
26 --- a/svr-runopts.c
27 +++ b/svr-runopts.c
28 @@ -98,8 +98,10 @@ static void printhelp(const char * progn
29 " (default port is %s if none specified)\n"
30 "-P PidFile Create pid file PidFile\n"
31 " (default %s)\n"
32 +#ifdef SO_BINDTODEVICE
33 "-l <interface>\n"
34 " interface to bind on\n"
35 +#endif
36 #if INETD_MODE
37 "-i Start for inetd\n"
38 #endif
39 @@ -267,9 +269,11 @@ void svr_getopts(int argc, char ** argv)
40 case 'P':
41 next = &svr_opts.pidfile;
42 break;
43 +#ifdef SO_BINDTODEVICE
44 case 'l':
45 next = &svr_opts.interface;
46 break;
47 +#endif
48 #if DO_MOTD
49 /* motd is displayed by default, -m turns it off */
50 case 'm':