reconnect_set_name(s->reconnect, jsonrpc_get_name(jsonrpc));
reconnect_set_max_tries(s->reconnect, 0);
reconnect_connected(s->reconnect, time_msec());
+ s->dscp = 0;
s->rpc = jsonrpc;
s->stream = NULL;
s->pstream = NULL;
}
if (s->rpc) {
+ size_t backlog;
int error;
+ backlog = jsonrpc_get_backlog(s->rpc);
jsonrpc_run(s->rpc);
+ if (jsonrpc_get_backlog(s->rpc) < backlog) {
+ /* Data previously caught in a queue was successfully sent (or
+ * there's an error, which we'll catch below.)
+ *
+ * We don't count data that is successfully sent immediately as
+ * activity, because there's a lot of queuing downstream from us,
+ * which means that we can push a lot of data into a connection
+ * that has stalled and won't ever recover.
+ */
+ reconnect_activity(s->reconnect, time_msec());
+ }
+
error = jsonrpc_get_status(s->rpc);
if (error) {
reconnect_disconnected(s->reconnect, time_msec(), error);
struct jsonrpc_msg *msg;
jsonrpc_recv(s->rpc, &msg);
if (msg) {
- reconnect_received(s->reconnect, time_msec());
+ reconnect_activity(s->reconnect, time_msec());
if (msg->type == JSONRPC_REQUEST && !strcmp(msg->method, "echo")) {
/* Echo request. Send reply. */
struct jsonrpc_msg *reply;
jsonrpc_session_set_dscp(struct jsonrpc_session *s,
uint8_t dscp)
{
- s->dscp = dscp;
+ if (s->dscp != dscp) {
+ s->dscp = dscp;
+ jsonrpc_session_force_reconnect(s);
+ }
}