Attachment 602615 Details for Bug 844607 – Patch to retry on net outage

[patch] Patch to retry on net outage

aiccu-20070115-retry-on-network-outage.diff (text/plain), 4.47 KB, created by Conrad Meyer on 2012-08-07 01:25:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Conrad Meyer

Created: 2012-08-07 01:25:53 UTC

Size: 4.47 KB

patch

obsolete

>diff -urN aiccu.orig/common/tic.c aiccu/common/tic.c
>--- aiccu.orig/common/tic.c	2007-01-11 05:41:31.000000000 -0800
>+++ aiccu/common/tic.c	2012-08-06 18:23:42.543163797 -0700
>@@ -60,9 +60,10 @@
> 	return 0;
> }
> 
>-bool tic_Login(struct TIC_conf *tic, const char *username, const char *password, const char *server)
>+bool tic_Login(struct TIC_conf *tic, const char *username, const char *password, const char *server, bool test_mode)
> {
> 	char		buf[1024], sSignature[33], sChallenge[1024];
>+	bool		connection_failure_logged = false;
> 	int		i;
> #ifndef _WIN32
> 	struct utsname	uts_name;
>@@ -76,11 +77,30 @@
> 	D(dolog(LOG_DEBUG, "Trying to connect to TIC server %s\n", server));
> 
> 	/* Connect to the TIC server */
>-	tic->sock = connect_client(server, TIC_PORT, AF_INET, SOCK_STREAM);
>-	if (!tic->sock)
>-	{
>-		dolog(LOG_ERR, "Couldn't connect to the TIC server %s\n", server);
>-		return false;
>+	while (true) {
>+		tic->sock = connect_client(server, TIC_PORT, AF_INET, SOCK_STREAM);
>+		if (tic->sock)
>+			break;
>+
>+		if (!connection_failure_logged) {
>+			dolog(LOG_ERR, "Couldn't connect to the TIC server %s\n", server);
>+			connection_failure_logged = true;
>+		}
>+
>+		if (test_mode)
>+			return false;
>+
>+		/*
>+		 * CEM: if connect_client() fails, the client was unable to
>+		 * resolve TIC or connect(2) failed. Since we haven't yet
>+		 * talked to the TIC server across the network, this shouldn't
>+		 * possibly ddos sixxs.
>+		 */
>+		sleep(15);
>+	}
>+
>+	if (connection_failure_logged) {
>+		dolog(LOG_INFO, "Succesfully connected to the TIC server %s\n", server);
> 	}
> 
> 	/* Fetch the welcome */
>diff -urN aiccu.orig/common/tic.h aiccu/common/tic.h
>--- aiccu.orig/common/tic.h	2006-12-21 06:08:50.000000000 -0800
>+++ aiccu/common/tic.h	2012-08-06 18:16:57.998867176 -0700
>@@ -120,7 +120,7 @@
> **********************************************************/
> 
> /* Login to/Logout from the TIC Server */
>-bool tic_Login(struct TIC_conf *tic, const char *username, const char *password, const char *server);
>+bool tic_Login(struct TIC_conf *tic, const char *username, const char *password, const char *server, bool test_mode);
> void tic_Logout(struct TIC_conf *tic, const char *quitmsg);
> 
> /* Check if the time is in range */
>diff -urN aiccu.orig/debugfiles.list aiccu/debugfiles.list
>--- aiccu.orig/debugfiles.list	1969-12-31 16:00:00.000000000 -0800
>+++ aiccu/debugfiles.list	2012-08-06 18:16:58.656859512 -0700
>@@ -0,0 +1,9 @@
>+%dir /usr/lib/debug
>+%dir /usr/lib/debug/.build-id
>+%dir /usr/lib/debug/.build-id/83
>+%dir /usr/lib/debug/usr
>+%dir /usr/lib/debug/usr/sbin
>+/usr/lib/debug/.build-id/83/784932c95e8b29b1ef92ef586692bcd2414ab3
>+/usr/lib/debug/.build-id/83/784932c95e8b29b1ef92ef586692bcd2414ab3.debug
>+/usr/lib/debug/usr/sbin/aiccu.debug
>+/usr/src/debug/aiccu
>diff -urN aiccu.orig/debuglinks.list aiccu/debuglinks.list
>--- aiccu.orig/debuglinks.list	1969-12-31 16:00:00.000000000 -0800
>+++ aiccu/debuglinks.list	2012-08-06 18:16:58.636859746 -0700
>@@ -0,0 +1,2 @@
>+/usr/lib/debug/.build-id/83/784932c95e8b29b1ef92ef586692bcd2414ab3 /usr/sbin/aiccu
>+/usr/lib/debug/.build-id/83/784932c95e8b29b1ef92ef586692bcd2414ab3.debug /usr/lib/debug/usr/sbin/aiccu.debug
>Binary files aiccu.orig/debugsources.list and aiccu/debugsources.list differ
>diff -urN aiccu.orig/unix-console/main.c aiccu/unix-console/main.c
>--- aiccu.orig/unix-console/main.c	2007-01-15 03:57:34.000000000 -0800
>+++ aiccu/unix-console/main.c	2012-08-06 18:16:57.999867165 -0700
>@@ -77,7 +77,7 @@
> {
> 	struct TIC_sTunnel *hsTunnel, *t;
> 
>-	if (!tic_Login(g_aiccu->tic, g_aiccu->username, g_aiccu->password, g_aiccu->server)) return 0;
>+	if (!tic_Login(g_aiccu->tic, g_aiccu->username, g_aiccu->password, g_aiccu->server, true/*test_mode=no retry*/)) return 0;
> 
> 	hsTunnel = tic_ListTunnels(g_aiccu->tic);
> 
>@@ -147,15 +147,16 @@
>  * returns a TIC_Tunnel which can then be
>  * used for configuring and keeping it running
>  */
>-struct TIC_Tunnel *get_tunnel(void);
>-struct TIC_Tunnel *get_tunnel(void)
>+struct TIC_Tunnel *get_tunnel(bool);
>+struct TIC_Tunnel *get_tunnel(bool test_mode)
> {
> 	
> 	struct TIC_sTunnel	*hsTunnel, *t;
> 	struct TIC_Tunnel	*hTunnel;
> 
> 	/* Login to the TIC Server */
>-	if (!tic_Login(g_aiccu->tic, g_aiccu->username, g_aiccu->password, g_aiccu->server)) return NULL;
>+	if (!tic_Login(g_aiccu->tic, g_aiccu->username, g_aiccu->password, g_aiccu->server, test_mode))
>+		return NULL;
> 
> 	/* 
> 	 * Don't try to list the tunnels when
>@@ -332,7 +333,7 @@
> 	}
> 
> 	/* Get our tunnel */
>-	hTunnel = get_tunnel();
>+	hTunnel = get_tunnel((mode == A_TEST || mode == A_AUTOTEST));
> 	
> 	if (!hTunnel)
> 	{

Actions: View | Diff

Attachments on bug 844607: 602614 | 602615 | 602791 | 602794 | 603220 | 713303 | 714220 | 935170