git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-actions: Fix the check for instruction ordering and duplication.
[sliver-openvswitch.git]
/
tests
/
test-reconnect.c
diff --git
a/tests/test-reconnect.c
b/tests/test-reconnect.c
index
494046c
..
020ae48
100644
(file)
--- a/
tests/test-reconnect.c
+++ b/
tests/test-reconnect.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010, 2011
Nicira Networks
.
+ * Copyright (c) 2009, 2010, 2011
, 2012 Nicira, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-148,9
+148,9
@@
do_connected(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
}
static void
}
static void
-do_
received
(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+do_
activity
(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
{
{
- reconnect_
received
(reconnect, now);
+ reconnect_
activity
(reconnect, now);
}
static void
}
static void
@@
-220,10
+220,10
@@
diff_stats(const struct reconnect_stats *old,
new->state, new->state_elapsed, new->backoff);
}
if (old->creation_time != new->creation_time
new->state, new->state_elapsed, new->backoff);
}
if (old->creation_time != new->creation_time
- || old->last_
received != new->last_received
+ || old->last_
activity != new->last_activity
|| old->last_connected != new->last_connected) {
|| old->last_connected != new->last_connected) {
- printf(" created %lld, last
received
%lld, last connected %lld\n",
- new->creation_time, new->last_
received
, new->last_connected);
+ printf(" created %lld, last
activity
%lld, last connected %lld\n",
+ new->creation_time, new->last_
activity
, new->last_connected);
}
if (old->n_successful_connections != new->n_successful_connections
|| old->n_attempted_connections != new->n_attempted_connections
}
if (old->n_successful_connections != new->n_successful_connections
|| old->n_attempted_connections != new->n_attempted_connections
@@
-280,7
+280,7
@@
static const struct command commands[] = {
{ "connecting", 0, 0, do_connecting },
{ "connect-failed", 0, 1, do_connect_failed },
{ "connected", 0, 0, do_connected },
{ "connecting", 0, 0, do_connecting },
{ "connect-failed", 0, 1, do_connect_failed },
{ "connected", 0, 0, do_connected },
- { "
received", 0, 0, do_received
},
+ { "
activity", 0, 0, do_activity
},
{ "run", 0, 1, do_run },
{ "advance", 1, 1, do_advance },
{ "timeout", 0, 0, do_timeout },
{ "run", 0, 1, do_run },
{ "advance", 1, 1, do_advance },
{ "timeout", 0, 0, do_timeout },