Attachment 8608 Details for Bug 17963 – p

p (text/plain; charset=us-ascii), 2.08 KB, created by ru on 2000-04-14 10:17:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ru

Created: 2000-04-14 10:17:59 UTC

Size: 2.08 KB

patch

obsolete

>Index: alias_db.c
>===================================================================
>RCS file: /usr/FreeBSD-CVS/src/lib/libalias/alias_db.c,v
>retrieving revision 1.10.2.5
>diff -u -p -r1.10.2.5 alias_db.c
>--- alias_db.c	1999/12/21 00:04:09	1.10.2.5
>+++ alias_db.c	2000/04/14 08:34:44
>@@ -1538,22 +1538,19 @@ SetStateIn(struct alias_link *link, int 
>     /* TCP input state */
>     switch (state) {
>     case ALIAS_TCP_STATE_DISCONNECTED:
>-        if (link->data.tcp->state.out != ALIAS_TCP_STATE_CONNECTED) {
>+        if (link->data.tcp->state.out != ALIAS_TCP_STATE_CONNECTED)
>             link->expire_time = TCP_EXPIRE_DEAD;
>-        } else {
>+        else
>             link->expire_time = TCP_EXPIRE_SINGLEDEAD;
>-        }
>-        link->data.tcp->state.in = state;
>         break;
>     case ALIAS_TCP_STATE_CONNECTED:
>-        link->expire_time = TCP_EXPIRE_CONNECTED;
>-        /*FALLTHROUGH*/
>-    case ALIAS_TCP_STATE_NOT_CONNECTED:
>-        link->data.tcp->state.in = state;
>+        if (link->data.tcp->state.out == ALIAS_TCP_STATE_CONNECTED)
>+            link->expire_time = TCP_EXPIRE_CONNECTED;
>         break;
>     default:
>         abort();
>     }
>+    link->data.tcp->state.in = state;
> }
> 
> 
>@@ -1563,22 +1560,19 @@ SetStateOut(struct alias_link *link, int
>     /* TCP output state */
>     switch (state) {
>     case ALIAS_TCP_STATE_DISCONNECTED:
>-        if (link->data.tcp->state.in != ALIAS_TCP_STATE_CONNECTED) {
>+        if (link->data.tcp->state.in != ALIAS_TCP_STATE_CONNECTED)
>             link->expire_time = TCP_EXPIRE_DEAD;
>-        } else {
>+        else
>             link->expire_time = TCP_EXPIRE_SINGLEDEAD;
>-        }
>-        link->data.tcp->state.out = state;
>         break;
>     case ALIAS_TCP_STATE_CONNECTED:
>-        link->expire_time = TCP_EXPIRE_CONNECTED;
>-        /*FALLTHROUGH*/
>-    case ALIAS_TCP_STATE_NOT_CONNECTED:
>-        link->data.tcp->state.out = state;
>+        if (link->data.tcp->state.in == ALIAS_TCP_STATE_CONNECTED)
>+            link->expire_time = TCP_EXPIRE_CONNECTED;
>         break;
>     default:
>         abort();
>     }
>+    link->data.tcp->state.out = state;
> }
> 
>

Actions: View

Attachments on bug 17963: 8608