Still refactoring network modules.

Perry Werneck
1 parent efb25644
Showing 4 changed files with 47 additions and 38 deletions Show diff stats
src/core/host.c
src/include/networking.h
src/network_modules/default/main.c
src/network_modules/select.c
@@ -62,6 +62,7 @@
 #include <lib3270/trace.h>
 #include <lib3270/toggle.h>
 #include <lib3270/keyboard.h>
+#include <networking.h>
 /**
  * @brief Called from timer to attempt an automatic reconnection.
@@ -368,6 +369,7 @@ LIB3270_EXPORT int lib3270_set_url(H3270 *h, const char *n)
 	if(!n)
 		return errno = ENOENT;
+/*
 	static const struct _sch
 	{
 		char			  ssl;
@@ -386,37 +388,21 @@ LIB3270_EXPORT int lib3270_set_url(H3270 *h, const char *n)
 		{ 0, "telnet://",	"telnet"	}
 	};
-
+*/
 	lib3270_autoptr(char)	  str 		= strdup(n);
-	char					* hostname 	= str;
-	const char 				* srvc		= "telnet";
+	char					* hostname 	= lib3270_set_network_module_from_url(h,str);
+	const char 				* srvc;
 	char					* ptr;
 	char					* query		= "";
 	int						  f;
 	trace("%s(%s)",__FUNCTION__,str);
-#ifdef HAVE_LIBSSLx
-	h->ssl.enabled = 0;
-#endif // HAVE_LIBSSL
-
-	for(f=0;f < sizeof(sch)/sizeof(sch[0]);f++)
-	{
-		size_t sz = strlen(sch[f].text);
-		if(!strncasecmp(hostname,sch[f].text,sz))
-		{
-#ifdef HAVE_LIBSSLx
-			h->ssl.enabled	= sch[f].ssl;
-#endif // HAVE_LIBSSL
-			srvc			= sch[f].srvc;
-			hostname		+= sz;
-			break;
-		}
-	}
-
-	if(!*hostname)
+	if(!(hostname && *hostname))
 		return 0;
+	srvc = h->network.module->service;
+
 	ptr = strchr(hostname,':');
 	if(ptr)
 	{
@@ -190,6 +190,14 @@
 	LIB3270_INTERNAL int lib3270_network_send_failed(H3270 *hSession);
 	/**
+	 * @breif Select the network context from URL.
+	 *
+	 * @return Pointer to the hostname or NULL if failed (sets errno).
+	 *
+	 */
+	LIB3270_INTERNAL const char * lib3270_set_network_module_from_url(H3270 *hSession, const char *url);
+
+	/**
 	 * @brief Select the default (unsecure) network context.
 	 *
 	 * @param hSession	TN3270 Session handle.
@@ -87,8 +87,6 @@
 }
 static int unsecure_network_getsockname(const H3270 *hSession, struct sockaddr *addr, socklen_t *addrlen) {
-	if(hSession->network.context->sock < 0)
-		return -(errno = ENOTCONN);
 	return getsockname(hSession->network.context->sock, addr, addrlen);
 }
@@ -160,27 +158,14 @@ static int unsecure_network_is_connected(const H3270 *hSession) {
 }
 static int unsecure_network_setsockopt(H3270 *hSession, int level, int optname, const void *optval, size_t optlen) {
-
-	if(hSession->network.context->sock < 0) {
-		errno = ENOTCONN;
-		return -1;
-	}
-
 	return setsockopt(hSession->network.context->sock, level, optname, optval, optlen);
-
 }
 static int unsecure_network_getsockopt(H3270 *hSession, int level, int optname, void *optval, socklen_t *optlen) {
-
-	if(hSession->network.context->sock < 0) {
-		errno = ENOTCONN;
-		return -1;
-	}
-
 	return getsockopt(hSession->network.context->sock, level, optname, optval, optlen);
 }
-static int unsecure_network_init(H3270 GNUC_UNUSED(*hSession), LIB3270_NETWORK_STATE GNUC_UNUSED(*state)) {
+static int unsecure_network_init(H3270 GNUC_UNUSED(*hSession)) {
 	return 0;
 }
@@ -35,4 +35,34 @@
  #include <config.h>
  #include <lib3270.h>
  #include <lib3270/log.h>
+ #include <lib3270/trace.h>
  #include <networking.h>
+ #include <string.h>
+
+ /*--[ Implement ]------------------------------------------------------------------------------------*/
+
+ const char * lib3270_set_network_module_from_url(H3270 *hSession, const char *url) {
+
+	static const struct {
+		const char *scheme;					///< @brief URL scheme for module.
+		void (*activate)(H3270 *hSession);	///< @brief Selection method.
+	} modules[] = {
+
+		{ "tn3270://",	lib3270_set_default_network_module },
+
+	};
+
+	size_t ix;
+
+	for(ix=0;ix < (sizeof(modules)/sizeof(modules[0])); ix++) {
+
+		size_t len = strlen(modules[ix].scheme);
+		if(!strncasecmp(url,modules[ix].scheme,len)) {
+			modules[ix].activate(hSession);
+			return url+len;
+		}
+
+	}
+
+	return NULL;
+ }
	@@ -190,6 +190,14 @@		@@ -190,6 +190,14 @@
190	LIB3270_INTERNAL int lib3270_network_send_failed(H3270 *hSession);	190	LIB3270_INTERNAL int lib3270_network_send_failed(H3270 *hSession);
191		191
192	/**	192	/**
		193	+ * @breif Select the network context from URL.
		194	+ *
		195	+ * @return Pointer to the hostname or NULL if failed (sets errno).
		196	+ *
		197	+ */
		198	+ LIB3270_INTERNAL const char * lib3270_set_network_module_from_url(H3270 hSession, const char url);
		199	+
		200	+ /**
193	* @brief Select the default (unsecure) network context.	201	* @brief Select the default (unsecure) network context.
194	*	202	*
195	* @param hSession TN3270 Session handle.	203	* @param hSession TN3270 Session handle.
	@@ -35,4 +35,34 @@		@@ -35,4 +35,34 @@
35	#include <config.h>	35	#include <config.h>
36	#include <lib3270.h>	36	#include <lib3270.h>
37	#include <lib3270/log.h>	37	#include <lib3270/log.h>
		38	+ #include <lib3270/trace.h>
38	#include <networking.h>	39	#include <networking.h>
		40	+ #include <string.h>
		41	+
		42	+ /--[ Implement ]------------------------------------------------------------------------------------/
		43	+
		44	+ const char * lib3270_set_network_module_from_url(H3270 hSession, const char url) {
		45	+
		46	+ static const struct {
		47	+ const char *scheme; ///< @brief URL scheme for module.
		48	+ void (activate)(H3270 hSession); ///< @brief Selection method.
		49	+ } modules[] = {
		50	+
		51	+ { "tn3270://", lib3270_set_default_network_module },
		52	+
		53	+ };
		54	+
		55	+ size_t ix;
		56	+
		57	+ for(ix=0;ix < (sizeof(modules)/sizeof(modules[0])); ix++) {
		58	+
		59	+ size_t len = strlen(modules[ix].scheme);
		60	+ if(!strncasecmp(url,modules[ix].scheme,len)) {
		61	+ modules[ix].activate(hSession);
		62	+ return url+len;
		63	+ }
		64	+
		65	+ }
		66	+
		67	+ return NULL;
		68	+ }