From 0d65438ea125610025cd0a691202369349945567 Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Wed, 10 Nov 2021 13:00:41 +0100 Subject: [PATCH] [forwardport] fix(netxlite): remove android-specific errno (#586) (#587) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit forward ports 74947dbbd12266c12a38fad51a70fc78a21720fd from the `release/3.11` branch to `master`. Here's the original commit message: - - - Android is also Linux. The Android build fails because both errno_linux.go and errno_android.go are compiled. There's no difference between the files except into a comment that mentions "linux" or "android". Therefore, it's safe to remove the android-specific file and just keep and use the linux-specific one. Part of https://github.com/ooni/probe/issues/1863, where we're forward porting ooni/go patches to go1.17. I'm still trying to figure out whether I can build oonimkall using the forward ported patches and this error prevents me from building, because the build fails. "やれやれだぜ" Note that this patch WILL need to be forward ported to master. This bug was previosuly reported to me by @hellais. Because I did run `go generate ./internal/netxlite/...` we also get for free updated certificates, which is OK. --- internal/netxlite/certifi.go | 84 ++++++++- internal/netxlite/errno.go | 2 +- internal/netxlite/errno_android.go | 112 ------------ internal/netxlite/errno_android_test.go | 188 -------------------- internal/netxlite/errno_darwin.go | 2 +- internal/netxlite/errno_darwin_test.go | 2 +- internal/netxlite/errno_freebsd.go | 2 +- internal/netxlite/errno_freebsd_test.go | 2 +- internal/netxlite/errno_ios.go | 2 +- internal/netxlite/errno_ios_test.go | 2 +- internal/netxlite/errno_linux.go | 2 +- internal/netxlite/errno_linux_test.go | 2 +- internal/netxlite/errno_windows.go | 2 +- internal/netxlite/errno_windows_test.go | 2 +- internal/netxlite/internal/generrno/main.go | 3 +- 15 files changed, 93 insertions(+), 316 deletions(-) delete mode 100644 internal/netxlite/errno_android.go delete mode 100644 internal/netxlite/errno_android_test.go diff --git a/internal/netxlite/certifi.go b/internal/netxlite/certifi.go index 776a938..1cd4845 100644 --- a/internal/netxlite/certifi.go +++ b/internal/netxlite/certifi.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2021-10-20 14:12:54.599493 +0200 CEST m=+0.419755751 +// 2021-11-10 12:32:19.01980139 +0100 CET m=+0.363371740 // https://curl.haxx.se/ca/cacert.pem package netxlite @@ -10,7 +10,7 @@ const pemcerts string = ` ## ## Bundle of CA Root Certificates ## -## Certificate data from Mozilla as of: Thu Sep 30 03:12:05 2021 GMT +## Certificate data from Mozilla as of: Tue Oct 26 03:12:05 2021 GMT ## ## This is a bundle of X.509 certificates of public Certificate Authorities ## (CA). These were automatically extracted from Mozilla's root certificates @@ -23,7 +23,7 @@ const pemcerts string = ` ## Just configure this file as the SSLCACertificateFile. ## ## Conversion done with mk-ca-bundle.pl version 1.28. -## SHA256: c8f6733d1ff4e6a4769c182971a1234f95ae079247a9c439a13423fe8ba5c24f +## SHA256: bb36818a81feaa4cca61101e6d6276cd09e972efcb08112dfed846918ca41d7f ## @@ -3162,4 +3162,82 @@ OPQD8rv7gmsHINFSH5pkAnuYZttcTVoP0ISVoDwUQwbKytu4QTbaakRnh6+v40URFWkIsr4WOZck bxJF0WddCajJFdr60qZfE2Efv4WstK2tBZQIgx51F9NxO5NQI1mg7TyRVJ12AMXDuDjb -----END CERTIFICATE----- +TunTrust Root CA +================ +-----BEGIN CERTIFICATE----- +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 +-----END CERTIFICATE----- + +HARICA TLS RSA Root CA 2021 +=========================== +-----BEGIN CERTIFICATE----- +MIIFpDCCA4ygAwIBAgIQOcqTHO9D88aOk8f0ZIk4fjANBgkqhkiG9w0BAQsFADBsMQswCQYDVQQG +EwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u +cyBDQTEkMCIGA1UEAwwbSEFSSUNBIFRMUyBSU0EgUm9vdCBDQSAyMDIxMB4XDTIxMDIxOTEwNTUz +OFoXDTQ1MDIxMzEwNTUzN1owbDELMAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRl +bWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExJDAiBgNVBAMMG0hBUklDQSBUTFMgUlNB +IFJvb3QgQ0EgMjAyMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAIvC569lmwVnlskN +JLnQDmT8zuIkGCyEf3dRywQRNrhe7Wlxp57kJQmXZ8FHws+RFjZiPTgE4VGC/6zStGndLuwRo0Xu +a2s7TL+MjaQenRG56Tj5eg4MmOIjHdFOY9TnuEFE+2uva9of08WRiFukiZLRgeaMOVig1mlDqa2Y +Ulhu2wr7a89o+uOkXjpFc5gH6l8Cct4MpbOfrqkdtx2z/IpZ525yZa31MJQjB/OCFks1mJxTuy/K +5FrZx40d/JiZ+yykgmvwKh+OC19xXFyuQnspiYHLA6OZyoieC0AJQTPb5lh6/a6ZcMBaD9YThnEv +dmn8kN3bLW7R8pv1GmuebxWMevBLKKAiOIAkbDakO/IwkfN4E8/BPzWr8R0RI7VDIp4BkrcYAuUR +0YLbFQDMYTfBKnya4dC6s1BG7oKsnTH4+yPiAwBIcKMJJnkVU2DzOFytOOqBAGMUuTNe3QvboEUH +GjMJ+E20pwKmafTCWQWIZYVWrkvL4N48fS0ayOn7H6NhStYqE613TBoYm5EPWNgGVMWX+Ko/IIqm +haZ39qb8HOLubpQzKoNQhArlT4b4UEV4AIHrW2jjJo3Me1xR9BQsQL4aYB16cmEdH2MtiKrOokWQ +CPxrvrNQKlr9qEgYRtaQQJKQCoReaDH46+0N0x3GfZkYVVYnZS6NRcUk7M7jAgMBAAGjQjBAMA8G +A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFApII6ZgpJIKM+qTW8VX6iVNvRLuMA4GA1UdDwEB/wQE +AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAPpBIqm5iFSVmewzVjIuJndftTgfvnNAUX15QvWiWkKQU +EapobQk1OUAJ2vQJLDSle1mESSmXdMgHHkdt8s4cUCbjnj1AUz/3f5Z2EMVGpdAgS1D0NTsY9FVq +QRtHBmg8uwkIYtlfVUKqrFOFrJVWNlar5AWMxajaH6NpvVMPxP/cyuN+8kyIhkdGGvMA9YCRotxD +QpSbIPDRzbLrLFPCU3hKTwSUQZqPJzLB5UkZv/HywouoCjkxKLR9YjYsTewfM7Z+d21+UPCfDtcR +j88YxeMn/ibvBZ3PzzfF0HvaO7AWhAw6k9a+F9sPPg4ZeAnHqQJyIkv3N3a6dcSFA1pj1bF1BcK5 +vZStjBWZp5N99sXzqnTPBIWUmAD04vnKJGW/4GKvyMX6ssmeVkjaef2WdhW+o45WxLM0/L5H9MG0 +qPzVMIho7suuyWPEdr6sOBjhXlzPrjoiUevRi7PzKzMHVIf6tLITe7pTBGIBnfHAT+7hOtSLIBD6 +Alfm78ELt5BGnBkpjNxvoEppaZS3JGWg/6w/zgH7IS79aPib8qXPMThcFarmlwDB31qlpzmq6YR/ +PFGoOtmUW4y/Twhx5duoXNTSpv4Ao8YWxw/ogM4cKGR0GQjTQuPOAF1/sdwTsOEFy9EgqoZ0njnn +kf3/W9b3raYvAwtt41dU63ZTGI0RmLo= +-----END CERTIFICATE----- + +HARICA TLS ECC Root CA 2021 +=========================== +-----BEGIN CERTIFICATE----- +MIICVDCCAdugAwIBAgIQZ3SdjXfYO2rbIvT/WeK/zjAKBggqhkjOPQQDAzBsMQswCQYDVQQGEwJH +UjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBD +QTEkMCIGA1UEAwwbSEFSSUNBIFRMUyBFQ0MgUm9vdCBDQSAyMDIxMB4XDTIxMDIxOTExMDExMFoX +DTQ1MDIxMzExMDEwOVowbDELMAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWlj +IGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExJDAiBgNVBAMMG0hBUklDQSBUTFMgRUNDIFJv +b3QgQ0EgMjAyMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABDgI/rGgltJ6rK9JOtDA4MM7KKrxcm1l +AEeIhPyaJmuqS7psBAqIXhfyVYf8MLA04jRYVxqEU+kw2anylnTDUR9YSTHMmE5gEYd103KUkE+b +ECUqqHgtvpBBWJAVcqeht6NCMEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUyRtTgRL+BNUW +0aq8mm+3oJUZbsowDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2cAMGQCMBHervjcToiwqfAi +rcJRQO9gcS3ujwLEXQNwSaSS6sUUiHCm0w2wqsosQJz76YJumgIwK0eaB8bRwoF8yguWGEEbo/Qw +CZ61IygNnxS2PFOiTAZpffpskcYqSUXm7LcT4Tps +-----END CERTIFICATE----- + ` diff --git a/internal/netxlite/errno.go b/internal/netxlite/errno.go index 58b2689..bcd5c2e 100644 --- a/internal/netxlite/errno.go +++ b/internal/netxlite/errno.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// Generated: 2021-10-20 14:12:55.50877 +0200 CEST m=+0.664237210 +// Generated: 2021-11-10 12:32:24.588032308 +0100 CET m=+4.347991484 package netxlite diff --git a/internal/netxlite/errno_android.go b/internal/netxlite/errno_android.go deleted file mode 100644 index 69ffe4b..0000000 --- a/internal/netxlite/errno_android.go +++ /dev/null @@ -1,112 +0,0 @@ -// Code generated by go generate; DO NOT EDIT. -// Generated: 2021-10-20 14:12:54.844727 +0200 CEST m=+0.000188960 - -package netxlite - -import ( - "errors" - "syscall" - - "golang.org/x/sys/unix" -) - -// This enumeration provides a canonical name for -// every system-call error we support. Note: this list -// is system dependent. You're currently looking at -// the list of errors for android. -const ( - ECONNREFUSED = unix.ECONNREFUSED - ECONNRESET = unix.ECONNRESET - EHOSTUNREACH = unix.EHOSTUNREACH - ETIMEDOUT = unix.ETIMEDOUT - EAFNOSUPPORT = unix.EAFNOSUPPORT - EADDRINUSE = unix.EADDRINUSE - EADDRNOTAVAIL = unix.EADDRNOTAVAIL - EISCONN = unix.EISCONN - EFAULT = unix.EFAULT - EBADF = unix.EBADF - ECONNABORTED = unix.ECONNABORTED - EALREADY = unix.EALREADY - EDESTADDRREQ = unix.EDESTADDRREQ - EINTR = unix.EINTR - EINVAL = unix.EINVAL - EMSGSIZE = unix.EMSGSIZE - ENETDOWN = unix.ENETDOWN - ENETRESET = unix.ENETRESET - ENETUNREACH = unix.ENETUNREACH - ENOBUFS = unix.ENOBUFS - ENOPROTOOPT = unix.ENOPROTOOPT - ENOTSOCK = unix.ENOTSOCK - ENOTCONN = unix.ENOTCONN - EWOULDBLOCK = unix.EWOULDBLOCK - EACCES = unix.EACCES - EPROTONOSUPPORT = unix.EPROTONOSUPPORT - EPROTOTYPE = unix.EPROTOTYPE -) - -// classifySyscallError converts a syscall error to the -// proper OONI error. Returns the OONI error string -// on success, an empty string otherwise. -func classifySyscallError(err error) string { - var errno syscall.Errno - if !errors.As(err, &errno) { - return "" - } - switch errno { - case unix.ECONNREFUSED: - return FailureConnectionRefused - case unix.ECONNRESET: - return FailureConnectionReset - case unix.EHOSTUNREACH: - return FailureHostUnreachable - case unix.ETIMEDOUT: - return FailureTimedOut - case unix.EAFNOSUPPORT: - return FailureAddressFamilyNotSupported - case unix.EADDRINUSE: - return FailureAddressInUse - case unix.EADDRNOTAVAIL: - return FailureAddressNotAvailable - case unix.EISCONN: - return FailureAlreadyConnected - case unix.EFAULT: - return FailureBadAddress - case unix.EBADF: - return FailureBadFileDescriptor - case unix.ECONNABORTED: - return FailureConnectionAborted - case unix.EALREADY: - return FailureConnectionAlreadyInProgress - case unix.EDESTADDRREQ: - return FailureDestinationAddressRequired - case unix.EINTR: - return FailureInterrupted - case unix.EINVAL: - return FailureInvalidArgument - case unix.EMSGSIZE: - return FailureMessageSize - case unix.ENETDOWN: - return FailureNetworkDown - case unix.ENETRESET: - return FailureNetworkReset - case unix.ENETUNREACH: - return FailureNetworkUnreachable - case unix.ENOBUFS: - return FailureNoBufferSpace - case unix.ENOPROTOOPT: - return FailureNoProtocolOption - case unix.ENOTSOCK: - return FailureNotASocket - case unix.ENOTCONN: - return FailureNotConnected - case unix.EWOULDBLOCK: - return FailureOperationWouldBlock - case unix.EACCES: - return FailurePermissionDenied - case unix.EPROTONOSUPPORT: - return FailureProtocolNotSupported - case unix.EPROTOTYPE: - return FailureWrongProtocolType - } - return "" -} diff --git a/internal/netxlite/errno_android_test.go b/internal/netxlite/errno_android_test.go deleted file mode 100644 index d55e682..0000000 --- a/internal/netxlite/errno_android_test.go +++ /dev/null @@ -1,188 +0,0 @@ -// Code generated by go generate; DO NOT EDIT. -// Generated: 2021-10-20 14:12:54.927727 +0200 CEST m=+0.083189626 - -package netxlite - -import ( - "io" - "syscall" - "testing" - - "golang.org/x/sys/unix" -) - -func TestClassifySyscallError(t *testing.T) { - t.Run("for a non-syscall error", func(t *testing.T) { - if v := classifySyscallError(io.EOF); v != "" { - t.Fatalf("expected empty string, got '%s'", v) - } - }) - - t.Run("for ECONNREFUSED", func(t *testing.T) { - if v := classifySyscallError(unix.ECONNREFUSED); v != FailureConnectionRefused { - t.Fatalf("expected '%s', got '%s'", FailureConnectionRefused, v) - } - }) - - t.Run("for ECONNRESET", func(t *testing.T) { - if v := classifySyscallError(unix.ECONNRESET); v != FailureConnectionReset { - t.Fatalf("expected '%s', got '%s'", FailureConnectionReset, v) - } - }) - - t.Run("for EHOSTUNREACH", func(t *testing.T) { - if v := classifySyscallError(unix.EHOSTUNREACH); v != FailureHostUnreachable { - t.Fatalf("expected '%s', got '%s'", FailureHostUnreachable, v) - } - }) - - t.Run("for ETIMEDOUT", func(t *testing.T) { - if v := classifySyscallError(unix.ETIMEDOUT); v != FailureTimedOut { - t.Fatalf("expected '%s', got '%s'", FailureTimedOut, v) - } - }) - - t.Run("for EAFNOSUPPORT", func(t *testing.T) { - if v := classifySyscallError(unix.EAFNOSUPPORT); v != FailureAddressFamilyNotSupported { - t.Fatalf("expected '%s', got '%s'", FailureAddressFamilyNotSupported, v) - } - }) - - t.Run("for EADDRINUSE", func(t *testing.T) { - if v := classifySyscallError(unix.EADDRINUSE); v != FailureAddressInUse { - t.Fatalf("expected '%s', got '%s'", FailureAddressInUse, v) - } - }) - - t.Run("for EADDRNOTAVAIL", func(t *testing.T) { - if v := classifySyscallError(unix.EADDRNOTAVAIL); v != FailureAddressNotAvailable { - t.Fatalf("expected '%s', got '%s'", FailureAddressNotAvailable, v) - } - }) - - t.Run("for EISCONN", func(t *testing.T) { - if v := classifySyscallError(unix.EISCONN); v != FailureAlreadyConnected { - t.Fatalf("expected '%s', got '%s'", FailureAlreadyConnected, v) - } - }) - - t.Run("for EFAULT", func(t *testing.T) { - if v := classifySyscallError(unix.EFAULT); v != FailureBadAddress { - t.Fatalf("expected '%s', got '%s'", FailureBadAddress, v) - } - }) - - t.Run("for EBADF", func(t *testing.T) { - if v := classifySyscallError(unix.EBADF); v != FailureBadFileDescriptor { - t.Fatalf("expected '%s', got '%s'", FailureBadFileDescriptor, v) - } - }) - - t.Run("for ECONNABORTED", func(t *testing.T) { - if v := classifySyscallError(unix.ECONNABORTED); v != FailureConnectionAborted { - t.Fatalf("expected '%s', got '%s'", FailureConnectionAborted, v) - } - }) - - t.Run("for EALREADY", func(t *testing.T) { - if v := classifySyscallError(unix.EALREADY); v != FailureConnectionAlreadyInProgress { - t.Fatalf("expected '%s', got '%s'", FailureConnectionAlreadyInProgress, v) - } - }) - - t.Run("for EDESTADDRREQ", func(t *testing.T) { - if v := classifySyscallError(unix.EDESTADDRREQ); v != FailureDestinationAddressRequired { - t.Fatalf("expected '%s', got '%s'", FailureDestinationAddressRequired, v) - } - }) - - t.Run("for EINTR", func(t *testing.T) { - if v := classifySyscallError(unix.EINTR); v != FailureInterrupted { - t.Fatalf("expected '%s', got '%s'", FailureInterrupted, v) - } - }) - - t.Run("for EINVAL", func(t *testing.T) { - if v := classifySyscallError(unix.EINVAL); v != FailureInvalidArgument { - t.Fatalf("expected '%s', got '%s'", FailureInvalidArgument, v) - } - }) - - t.Run("for EMSGSIZE", func(t *testing.T) { - if v := classifySyscallError(unix.EMSGSIZE); v != FailureMessageSize { - t.Fatalf("expected '%s', got '%s'", FailureMessageSize, v) - } - }) - - t.Run("for ENETDOWN", func(t *testing.T) { - if v := classifySyscallError(unix.ENETDOWN); v != FailureNetworkDown { - t.Fatalf("expected '%s', got '%s'", FailureNetworkDown, v) - } - }) - - t.Run("for ENETRESET", func(t *testing.T) { - if v := classifySyscallError(unix.ENETRESET); v != FailureNetworkReset { - t.Fatalf("expected '%s', got '%s'", FailureNetworkReset, v) - } - }) - - t.Run("for ENETUNREACH", func(t *testing.T) { - if v := classifySyscallError(unix.ENETUNREACH); v != FailureNetworkUnreachable { - t.Fatalf("expected '%s', got '%s'", FailureNetworkUnreachable, v) - } - }) - - t.Run("for ENOBUFS", func(t *testing.T) { - if v := classifySyscallError(unix.ENOBUFS); v != FailureNoBufferSpace { - t.Fatalf("expected '%s', got '%s'", FailureNoBufferSpace, v) - } - }) - - t.Run("for ENOPROTOOPT", func(t *testing.T) { - if v := classifySyscallError(unix.ENOPROTOOPT); v != FailureNoProtocolOption { - t.Fatalf("expected '%s', got '%s'", FailureNoProtocolOption, v) - } - }) - - t.Run("for ENOTSOCK", func(t *testing.T) { - if v := classifySyscallError(unix.ENOTSOCK); v != FailureNotASocket { - t.Fatalf("expected '%s', got '%s'", FailureNotASocket, v) - } - }) - - t.Run("for ENOTCONN", func(t *testing.T) { - if v := classifySyscallError(unix.ENOTCONN); v != FailureNotConnected { - t.Fatalf("expected '%s', got '%s'", FailureNotConnected, v) - } - }) - - t.Run("for EWOULDBLOCK", func(t *testing.T) { - if v := classifySyscallError(unix.EWOULDBLOCK); v != FailureOperationWouldBlock { - t.Fatalf("expected '%s', got '%s'", FailureOperationWouldBlock, v) - } - }) - - t.Run("for EACCES", func(t *testing.T) { - if v := classifySyscallError(unix.EACCES); v != FailurePermissionDenied { - t.Fatalf("expected '%s', got '%s'", FailurePermissionDenied, v) - } - }) - - t.Run("for EPROTONOSUPPORT", func(t *testing.T) { - if v := classifySyscallError(unix.EPROTONOSUPPORT); v != FailureProtocolNotSupported { - t.Fatalf("expected '%s', got '%s'", FailureProtocolNotSupported, v) - } - }) - - t.Run("for EPROTOTYPE", func(t *testing.T) { - if v := classifySyscallError(unix.EPROTOTYPE); v != FailureWrongProtocolType { - t.Fatalf("expected '%s', got '%s'", FailureWrongProtocolType, v) - } - }) - - t.Run("for the zero errno value", func(t *testing.T) { - if v := classifySyscallError(syscall.Errno(0)); v != "" { - t.Fatalf("expected empty string, got '%s'", v) - } - }) -} diff --git a/internal/netxlite/errno_darwin.go b/internal/netxlite/errno_darwin.go index 99d62bd..ca56433 100644 --- a/internal/netxlite/errno_darwin.go +++ b/internal/netxlite/errno_darwin.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// Generated: 2021-10-20 14:12:54.974877 +0200 CEST m=+0.130340293 +// Generated: 2021-11-10 12:32:20.240263878 +0100 CET m=+0.000223034 package netxlite diff --git a/internal/netxlite/errno_darwin_test.go b/internal/netxlite/errno_darwin_test.go index d08be28..9d00594 100644 --- a/internal/netxlite/errno_darwin_test.go +++ b/internal/netxlite/errno_darwin_test.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// Generated: 2021-10-20 14:12:55.045861 +0200 CEST m=+0.201324876 +// Generated: 2021-11-10 12:32:20.868774842 +0100 CET m=+0.628733978 package netxlite diff --git a/internal/netxlite/errno_freebsd.go b/internal/netxlite/errno_freebsd.go index a221332..69d2524 100644 --- a/internal/netxlite/errno_freebsd.go +++ b/internal/netxlite/errno_freebsd.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// Generated: 2021-10-20 14:12:55.086625 +0200 CEST m=+0.242089460 +// Generated: 2021-11-10 12:32:21.21962196 +0100 CET m=+0.979581106 package netxlite diff --git a/internal/netxlite/errno_freebsd_test.go b/internal/netxlite/errno_freebsd_test.go index 2e558c7..e3adc86 100644 --- a/internal/netxlite/errno_freebsd_test.go +++ b/internal/netxlite/errno_freebsd_test.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// Generated: 2021-10-20 14:12:55.158003 +0200 CEST m=+0.313467668 +// Generated: 2021-11-10 12:32:21.590776904 +0100 CET m=+1.350736040 package netxlite diff --git a/internal/netxlite/errno_ios.go b/internal/netxlite/errno_ios.go index 21f2688..d3ce93a 100644 --- a/internal/netxlite/errno_ios.go +++ b/internal/netxlite/errno_ios.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// Generated: 2021-10-20 14:12:55.199889 +0200 CEST m=+0.355353960 +// Generated: 2021-11-10 12:32:21.956427226 +0100 CET m=+1.716386362 package netxlite diff --git a/internal/netxlite/errno_ios_test.go b/internal/netxlite/errno_ios_test.go index 85ea4aa..5a65f3a 100644 --- a/internal/netxlite/errno_ios_test.go +++ b/internal/netxlite/errno_ios_test.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// Generated: 2021-10-20 14:12:55.26791 +0200 CEST m=+0.423375168 +// Generated: 2021-11-10 12:32:22.413994086 +0100 CET m=+2.173953232 package netxlite diff --git a/internal/netxlite/errno_linux.go b/internal/netxlite/errno_linux.go index 480b71b..e6b1ac4 100644 --- a/internal/netxlite/errno_linux.go +++ b/internal/netxlite/errno_linux.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// Generated: 2021-10-20 14:12:55.309355 +0200 CEST m=+0.464820460 +// Generated: 2021-11-10 12:32:22.795026799 +0100 CET m=+2.554985925 package netxlite diff --git a/internal/netxlite/errno_linux_test.go b/internal/netxlite/errno_linux_test.go index 1b7a4a5..3dbb256 100644 --- a/internal/netxlite/errno_linux_test.go +++ b/internal/netxlite/errno_linux_test.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// Generated: 2021-10-20 14:12:55.377268 +0200 CEST m=+0.532734710 +// Generated: 2021-11-10 12:32:23.366945689 +0100 CET m=+3.126904885 package netxlite diff --git a/internal/netxlite/errno_windows.go b/internal/netxlite/errno_windows.go index 77316d2..201b488 100644 --- a/internal/netxlite/errno_windows.go +++ b/internal/netxlite/errno_windows.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// Generated: 2021-10-20 14:12:55.419258 +0200 CEST m=+0.574724501 +// Generated: 2021-11-10 12:32:23.769840098 +0100 CET m=+3.529799255 package netxlite diff --git a/internal/netxlite/errno_windows_test.go b/internal/netxlite/errno_windows_test.go index a23907b..2e506f7 100644 --- a/internal/netxlite/errno_windows_test.go +++ b/internal/netxlite/errno_windows_test.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// Generated: 2021-10-20 14:12:55.470884 +0200 CEST m=+0.626351293 +// Generated: 2021-11-10 12:32:24.267604596 +0100 CET m=+4.027563753 package netxlite diff --git a/internal/netxlite/internal/generrno/main.go b/internal/netxlite/internal/generrno/main.go index e05c6bc..c342e26 100644 --- a/internal/netxlite/internal/generrno/main.go +++ b/internal/netxlite/internal/generrno/main.go @@ -173,7 +173,7 @@ var Specs = []*ErrorSpec{ // of the related golang.org/x/sys/$name library. func mapSystemToLibrary(system string) string { switch system { - case "android", "darwin", "freebsd", "ios", "linux": + case "darwin", "freebsd", "ios", "linux": return "unix" case "windows": return "windows" @@ -362,7 +362,6 @@ func writeSystemSpecificTestFile(system string) { // SupportedSystems contains the list of supported systems. var SupportedSystems = []string{ - "android", "darwin", "freebsd", "ios",