make thread-safe SOC backwards compatible

Author: ZeroSkill1

libctru/include/3ds/services/soc.h

@@ -12,8 +12,8 @@
 /// The config level to be used with @ref SOCU_GetNetworkOpt
 #define SOL_CONFIG 0xfffe
 
-/// Default number of SOC sessions to initialize
-#define SOC_DEFAULT_NUM_SESSIONS 3
+/// Default number of SOC sessions to initialize, for backwards compatibility
+#define SOC_DEFAULT_NUM_SESSIONS 1
 
 /// Options to be used with @ref SOCU_GetNetworkOpt
 typedef enum
@@ -104,10 +104,19 @@ typedef struct
  * @brief Initializes the SOC service.
  * @param context_addr Address of a page-aligned (0x1000) buffer to be used.
  * @param context_size Size of the buffer, a multiple of 0x1000.
- * @param num_sessions The number of sessions to initialize. This value determines how many socket syscalls can be run concurrently. Setting it to 1 means only one thread can safely use socket syscalls.
  * @note The specified context buffer can no longer be accessed by the process which called this function, since the userland permissions for this block are set to no-access.
+ * @note The SOC service can only be used in a single thread when using this function to initialize SOC services. In order to enable usage across multiple threads, use @ref socInitMulti, otherwise threads will block when using socket functions concurrently.
  */
-Result socInit(u32 *context_addr, u32 context_size, u32 num_sessions);
+Result socInit(u32 *context_addr, u32 context_size);
+
+/**
+ * @brief Initializes the SOC service for use across multiple threads.
+ * @param context_addr Address of a page-aligned (0x1000) buffer to be used.
+ * @param context_size Size of the buffer, a multiple of 0x1000.
+ * @param num_sessions The number of sessions to initialize. This value determines how many socket functions can be run concurrently. Setting it to 1 means only one thread can safely use socket functions.
+ * @note The specified context buffer can no longer be accessed by the process which called this function, since the userland permissions for this block are set to no-access.
+ */
+Result socInitMulti(u32 *context_addr, u32 context_size, u32 num_sessions);
 
 /**
  * @brief Closes the soc service.

libctru/source/services/soc/soc_init.c

@@ -228,7 +228,7 @@ static Result SOCU_Shutdown(void)
 	return cmdbuf[1];
 }
 
-Result socInit(u32* context_addr, u32 context_size, u32 num_sessions)
+Result socInitMulti(u32* context_addr, u32 context_size, u32 num_sessions)
 {
 	Result ret = 0;
 
@@ -270,6 +270,11 @@ Result socInit(u32* context_addr, u32 context_size, u32 num_sessions)
 	return 0;
 }
 
+Result socInit(u32* context_addr, u32 context_size)
+{
+	return socInitMulti(context_addr, context_size, SOC_DEFAULT_NUM_SESSIONS);
+}
+
 Result socExit(void)
 {
 	Result ret = 0;