Commit 4896a23a authored by Robert Lubos's avatar Robert Lubos Committed by Carles Cufi
Browse files

net: sockets: Fix TLS option overlap



Two TLS features developed in parallel resulted in the same option
number being assigned to two options. In this case give preference to
TLS_NATIVE, since it was longer in the tree.

Signed-off-by: default avatarRobert Lubos <robert.lubos@nordicsemi.no>
parent 20cb60ec
Loading
Loading
Loading
Loading
+9 −10
Original line number Diff line number Diff line
@@ -143,16 +143,6 @@ struct zsock_pollfd {
 *  ignored for PEM certificates.
 */
#define TLS_CERT_NOCOPY	       10
/** Socket option to control TLS session caching on a socket. Accepted values:
 *  - 0 - Disabled.
 *  - 1 - Enabled.
 */
#define TLS_SESSION_CACHE 11
/** Write-only socket option to purge session cache immediately.
 *  This option accepts any value.
 */
#define TLS_SESSION_CACHE_PURGE 12

/** TLS socket option to use with offloading. The option instructs the network
 *  stack only to offload underlying TCP/UDP communication. The TLS/DTLS
 *  operation is handled by a native TLS/DTLS socket implementation from Zephyr.
@@ -164,6 +154,15 @@ struct zsock_pollfd {
 *  dedicated network interface for the underlying TCP/UDP socket.
 */
#define TLS_NATIVE 11
/** Socket option to control TLS session caching on a socket. Accepted values:
 *  - 0 - Disabled.
 *  - 1 - Enabled.
 */
#define TLS_SESSION_CACHE 12
/** Write-only socket option to purge session cache immediately.
 *  This option accepts any value.
 */
#define TLS_SESSION_CACHE_PURGE 13

/** @} */