jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 15:00:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rx: avoid nat ping until connection is attached

Browse Source 
drop nat pings on connections we haven't talked on yet

Change-Id: Ie333d50a090f1f086c958440cc37849413442dea
Reviewed-on: http://gerrit.openafs.org/5130
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Derrick Brashear 2011-08-01 16:38:46 -04:00
parent c92f04af60
commit 496fb87372
2 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/rx/rx.c
View File

@ -3628,6 +3628,33 @@ TooLow(struct rx_packet *ap, struct rx_call *acall)
}
#endif /* KERNEL */
/*!
* Clear the attach wait flag on a connection and proceed.
*
* Any processing waiting for a connection to be attached should be
* unblocked. We clear the flag and do any other needed tasks.
*
* @param[in] conn
* the conn to unmark waiting for attach
*
* @pre conn's conn_data_lock must be locked before calling this function
*
*/
static void
rxi_ConnClearAttachWait(struct rx_connection *conn)
{
/* Indicate that rxi_CheckReachEvent is no longer running by
* clearing the flag. Must be atomic under conn_data_lock to
* avoid a new call slipping by: rxi_CheckConnReach holds
* conn_data_lock while checking RX_CONN_ATTACHWAIT.
*/
conn->flags &= ~RX_CONN_ATTACHWAIT;
if (conn->flags & RX_CONN_NAT_PING) {
conn->flags &= ~RX_CONN_NAT_PING;
rxi_ScheduleNatKeepAliveEvent(conn);
}
}
static void
rxi_CheckReachEvent(struct rxevent *event, void *arg1, void *arg2)
{
@ -3659,12 +3686,7 @@ rxi_CheckReachEvent(struct rxevent *event, void *arg1, void *arg2)
}
}
if (!call)
/* Indicate that rxi_CheckReachEvent is no longer running by
* clearing the flag. Must be atomic under conn_data_lock to
* avoid a new call slipping by: rxi_CheckConnReach holds
* conn_data_lock while checking RX_CONN_ATTACHWAIT.
*/
conn->flags &= ~RX_CONN_ATTACHWAIT;
rxi_ConnClearAttachWait(conn);
MUTEX_EXIT(&conn->conn_data_lock);
MUTEX_EXIT(&conn->conn_call_lock);
}
@ -4123,7 +4145,7 @@ rxi_UpdatePeerReach(struct rx_connection *conn, struct rx_call *acall)
if (conn->flags & RX_CONN_ATTACHWAIT) {
int i;
conn->flags &= ~RX_CONN_ATTACHWAIT;
rxi_ConnClearAttachWait(conn);
MUTEX_EXIT(&conn->conn_data_lock);
for (i = 0; i < RX_MAXCALLS; i++) {
@ -5146,7 +5168,7 @@ rxi_ConnectionError(struct rx_connection *conn,
if (conn->checkReachEvent) {
rxevent_Cancel(conn->checkReachEvent, (struct rx_call *)0, 0);
conn->checkReachEvent = 0;
conn->flags &= ~RX_CONN_ATTACHWAIT;
conn->flags &= ~(RX_CONN_ATTACHWAIT|RX_CONN_NAT_PING);
MUTEX_ENTER(&rx_refcnt_mutex);
conn->refCount--;
MUTEX_EXIT(&rx_refcnt_mutex);
@ -6400,8 +6422,12 @@ rx_SetConnSecondsUntilNatPing(struct rx_connection *conn, afs_int32 seconds)
{
MUTEX_ENTER(&conn->conn_data_lock);
conn->secondsUntilNatPing = seconds;
if (seconds != 0)
rxi_ScheduleNatKeepAliveEvent(conn);
if (seconds != 0) {
if (!(conn->flags & RX_CONN_ATTACHWAIT))
rxi_ScheduleNatKeepAliveEvent(conn);
else
conn->flags |= RX_CONN_NAT_PING;
}
MUTEX_EXIT(&conn->conn_data_lock);
}
@ -6409,7 +6435,11 @@ void
rxi_NatKeepAliveOn(struct rx_connection *conn)
{
MUTEX_ENTER(&conn->conn_data_lock);
rxi_ScheduleNatKeepAliveEvent(conn);
/* if it's already attached */
if (!(conn->flags & RX_CONN_ATTACHWAIT))
rxi_ScheduleNatKeepAliveEvent(conn);
else
conn->flags |= RX_CONN_NAT_PING;
MUTEX_EXIT(&conn->conn_data_lock);
}

1
src/rx/rx.h
View File

@ -444,6 +444,7 @@ struct rx_peer {
#define RX_CONN_BUSY 32 /* connection is busy; don't delete */
#define RX_CONN_ATTACHWAIT 64 /* attach waiting for peer->lastReach */
#define RX_CONN_MAKECALL_ACTIVE 128 /* a thread is actively in rx_NewCall */
#define RX_CONN_NAT_PING 256 /* nat ping requested */
/* Type of connection, client or server */
#define RX_CLIENT_CONNECTION 0