summaryrefslogtreecommitdiff
path: root/lib/libalias/alias_db.c
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2000-04-14 15:34:55 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2000-04-14 15:34:55 +0000
commitb5e819ec23e70de6e6f0246047a242dfab0f8f1f (patch)
tree312613ec678d96049ec67102bb53a26c39e57d13 /lib/libalias/alias_db.c
parent9ed5b61bdd6b75b38222297a2af32148dfed7366 (diff)
Notes
Diffstat (limited to 'lib/libalias/alias_db.c')
-rw-r--r--lib/libalias/alias_db.c26
1 files changed, 10 insertions, 16 deletions
diff --git a/lib/libalias/alias_db.c b/lib/libalias/alias_db.c
index 86223cd22e40..1ea34131dbf8 100644
--- a/lib/libalias/alias_db.c
+++ b/lib/libalias/alias_db.c
@@ -1544,22 +1544,19 @@ SetStateIn(struct alias_link *link, int state)
/* 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;
}
@@ -1569,22 +1566,19 @@ SetStateOut(struct alias_link *link, int state)
/* 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;
}