Merge branch 'android-fixes'
authorTobias Brunner <tobias@strongswan.org>
Wed, 24 Apr 2019 09:36:26 +0000 (11:36 +0200)
committerTobias Brunner <tobias@strongswan.org>
Wed, 24 Apr 2019 09:37:33 +0000 (11:37 +0200)
Fixes an upgrade issue and includes UTF8 support for EAP-MSCHAPv2.

src/libcharon/plugins/socket_default/socket_default_socket.c

index 68e5a7a..b59b60c 100644 (file)
@@ -559,7 +559,11 @@ METHOD(socket_t, sender, status_t,
        {
                if (family == AF_INET)
                {
+#ifdef __FreeBSD__
+                       int ds4;
+#else
                        uint8_t ds4;
+#endif
 
                        ds4 = packet->get_dscp(packet) << 2;
                        if (setsockopt(skt, SOL_IP, IP_TOS, &ds4, sizeof(ds4)) == 0)