diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2015-02-12 22:22:25 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2015-02-12 22:22:25 +0100 |
| commit | 9f0928c6593f937a17b7974b04051c57e3874b20 (patch) | |
| tree | 1aaffa07a5c177fef2c1386f1850a688045bec2e /main/openvpn | |
| parent | 68d26e1b1b5b411adce714c88532fc8889289f34 (diff) | |
Update OpenSSL to AOSP -master
Diffstat (limited to 'main/openvpn')
| -rw-r--r-- | main/openvpn/config-version.h | 2 | ||||
| -rw-r--r-- | main/openvpn/src/openvpn/ps.c | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/main/openvpn/config-version.h b/main/openvpn/config-version.h index 4aa92283..6044ed8e 100644 --- a/main/openvpn/config-version.h +++ b/main/openvpn/config-version.h @@ -1,2 +1,2 @@ -#define CONFIGURE_GIT_REVISION "icsopenvpn_627-cff5e3e9c3ac08df" +#define CONFIGURE_GIT_REVISION "icsopenvpn_629-3976c7f5f4d39f06" #define CONFIGURE_GIT_FLAGS "" diff --git a/main/openvpn/src/openvpn/ps.c b/main/openvpn/src/openvpn/ps.c index 6807aac0..fe18a9df 100644 --- a/main/openvpn/src/openvpn/ps.c +++ b/main/openvpn/src/openvpn/ps.c @@ -372,17 +372,6 @@ proxy_list_close (struct proxy_connection **list) } } -static void -sock_addr_set (struct openvpn_sockaddr *osaddr, - const in_addr_t addr, - const int port) -{ - CLEAR (*osaddr); - osaddr->addr.in4.sin_family = AF_INET; - osaddr->addr.in4.sin_addr.s_addr = htonl (addr); - osaddr->addr.in4.sin_port = htons (port); -} - static inline void proxy_connection_io_requeue (struct proxy_connection *pc, const int rwflags_new, struct event_set *es) { |