aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-24 01:24:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

jsonrpc: don't crash on multiple commands at once.

Browse Source 
Once we read a command, we are supposed to io_wait until it finishes.
However, we are actually woken in two places: when it's complete
(which is correct), and when it's written out (which is wrong).

We don't care when it's written out, only when it's finished:
refactor to make json_done() free and NULL the old ->current,
rather than have the callers do it.  Now it's clear that it's
ready for both new output and new input.

Fixes: #934
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-02-14 16:48:29 +10:30
committed by Christian Decker
parent cb1a4a5180
commit a08bcfdbd3
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/test_lightningd.py
View File

@@ -10,6 +10,7 @@ import queue
import os
import random
import re
import socket
import sqlite3
import string
import subprocess
@@ -3407,6 +3408,24 @@ class LightningDTests(BaseLightningDTests):
assert channels[i]['state'] == 'ONCHAIND_MUTUAL'
assert channels[-1]['state'] == 'CLOSINGD_COMPLETE'
def test_multirpc(self):
"""Test that we can do multiple RPC without waiting for response"""
l1,l2 = self.connect()
sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
sock.connect(l1.rpc.socket_path)
sock.sendall(b'{"id":1,"jsonrpc":"2.0","method":"listpeers","params":[]}\n'
b'{"id":2,"jsonrpc":"2.0","method":"listpeers","params":[]}\n'
b'{"id":3,"jsonrpc":"2.0","method":"listpeers","params":[]}\n'
b'{"id":4,"jsonrpc":"2.0","method":"listpeers","params":[]}\n'
b'{"id":5,"jsonrpc":"2.0","method":"listpeers","params":[]}\n'
b'{"id":6,"jsonrpc":"2.0","method":"listpeers","params":[]}\n')
# This isn't quite right, as it will read the first object and stop.
# But enough to trigger the crash!
l1.rpc._readobj(sock)
sock.close()
def test_cli(self):
l1 = self.node_factory.get_node()