From 01fe022e07a7dd3dd7e2d7b7f900e6ac2391ef07 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Wed, 20 Aug 2025 19:19:22 +0200 Subject: [PATCH 1/2] cluster/serializer/broker: Do not send empty metadata vectors around Event when there's no metadata attached to an event, we'd still use the constructor passing an empty metadata vector, resulting in an on-the-wire representation with an empty trailing vector. Particularly visible when just snooping events via websocat. There also seems to be some bug with the timestamp -1 handling. --- src/cluster/serializer/broker/Serializer.cc | 6 +- .../..client-metadata-from-client..stderr | 1 + .../..client-metadata-from-client.out | 5 + .../..client-metadata..stderr | 1 + .../..client-metadata.out | 5 + .../..client-no-metadata..stderr | 1 + .../..client-no-metadata.out | 5 + .../..manager-metadata-from-client..stderr | 2 + .../..manager-metadata-from-client.out | 4 + .../..manager-metadata..stderr | 2 + .../..manager-metadata.out | 4 + .../..manager-no-metadata..stderr | 2 + .../..manager-no-metadata.out | 4 + .../cluster/websocket/bad-event-args.zeek | 2 +- testing/btest/cluster/websocket/metadata.zeek | 121 ++++++++++++++++++ 15 files changed, 162 insertions(+), 3 deletions(-) create mode 100644 testing/btest/Baseline/cluster.websocket.metadata/..client-metadata-from-client..stderr create mode 100644 testing/btest/Baseline/cluster.websocket.metadata/..client-metadata-from-client.out create mode 100644 testing/btest/Baseline/cluster.websocket.metadata/..client-metadata..stderr create mode 100644 testing/btest/Baseline/cluster.websocket.metadata/..client-metadata.out create mode 100644 testing/btest/Baseline/cluster.websocket.metadata/..client-no-metadata..stderr create mode 100644 testing/btest/Baseline/cluster.websocket.metadata/..client-no-metadata.out create mode 100644 testing/btest/Baseline/cluster.websocket.metadata/..manager-metadata-from-client..stderr create mode 100644 testing/btest/Baseline/cluster.websocket.metadata/..manager-metadata-from-client.out create mode 100644 testing/btest/Baseline/cluster.websocket.metadata/..manager-metadata..stderr create mode 100644 testing/btest/Baseline/cluster.websocket.metadata/..manager-metadata.out create mode 100644 testing/btest/Baseline/cluster.websocket.metadata/..manager-no-metadata..stderr create mode 100644 testing/btest/Baseline/cluster.websocket.metadata/..manager-no-metadata.out create mode 100644 testing/btest/cluster/websocket/metadata.zeek diff --git a/src/cluster/serializer/broker/Serializer.cc b/src/cluster/serializer/broker/Serializer.cc index 8c0a72e122..38c66a0189 100644 --- a/src/cluster/serializer/broker/Serializer.cc +++ b/src/cluster/serializer/broker/Serializer.cc @@ -66,8 +66,8 @@ std::optional detail::to_broker_event(const zeek::cluster:: } // Convert metadata from the cluster::detail::Event event to broker's event metadata format. - broker::vector broker_meta; if ( const auto* meta = ev.Metadata(); meta != nullptr ) { + broker::vector broker_meta; broker_meta.reserve(meta->size()); for ( const auto& m : *meta ) { @@ -81,9 +81,11 @@ std::optional detail::to_broker_event(const zeek::cluster:: obj_desc_short(m.Val()).c_str()); } } + + return broker::zeek::Event(ev.HandlerName(), xs, broker_meta); } - return broker::zeek::Event(ev.HandlerName(), xs, broker_meta); + return broker::zeek::Event(ev.HandlerName(), xs); } std::optional detail::to_zeek_event(const broker::zeek::Event& ev) { diff --git a/testing/btest/Baseline/cluster.websocket.metadata/..client-metadata-from-client..stderr b/testing/btest/Baseline/cluster.websocket.metadata/..client-metadata-from-client..stderr new file mode 100644 index 0000000000..49d861c74c --- /dev/null +++ b/testing/btest/Baseline/cluster.websocket.metadata/..client-metadata-from-client..stderr @@ -0,0 +1 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. diff --git a/testing/btest/Baseline/cluster.websocket.metadata/..client-metadata-from-client.out b/testing/btest/Baseline/cluster.websocket.metadata/..client-metadata-from-client.out new file mode 100644 index 0000000000..8de62193ff --- /dev/null +++ b/testing/btest/Baseline/cluster.websocket.metadata/..client-metadata-from-client.out @@ -0,0 +1,5 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +Connected! +ack {'type': 'ack', 'endpoint': 'endpoint', 'version': 'endpoint'} +ping {'type': 'data-message', 'topic': '/test/pings/', '@data-type': 'vector', 'data': [{'@data-type': 'count', 'data': 1}, {'@data-type': 'count', 'data': 1}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'ping'}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'fourty-two'}, {'@data-type': 'count', 'data': 42}]}, {'@data-type': 'vector', 'data': [{'@data-type': 'vector', 'data': [{'@data-type': 'count', 'data': 1}, {'@data-type': 'timestamp', 'data': '1970-01-01T01:42:42'}]}]}]}]} +pong {'type': 'data-message', 'topic': '/test/pongs/', '@data-type': 'vector', 'data': [{'@data-type': 'count', 'data': 1}, {'@data-type': 'count', 'data': 1}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'pong'}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'fourty-two fourty-two'}, {'@data-type': 'count', 'data': 84}]}, {'@data-type': 'vector', 'data': [{'@data-type': 'vector', 'data': [{'@data-type': 'count', 'data': 1}, {'@data-type': 'timestamp', 'data': '1970-01-01T01:42:42.000'}]}]}]}]} diff --git a/testing/btest/Baseline/cluster.websocket.metadata/..client-metadata..stderr b/testing/btest/Baseline/cluster.websocket.metadata/..client-metadata..stderr new file mode 100644 index 0000000000..49d861c74c --- /dev/null +++ b/testing/btest/Baseline/cluster.websocket.metadata/..client-metadata..stderr @@ -0,0 +1 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. diff --git a/testing/btest/Baseline/cluster.websocket.metadata/..client-metadata.out b/testing/btest/Baseline/cluster.websocket.metadata/..client-metadata.out new file mode 100644 index 0000000000..4ce606d056 --- /dev/null +++ b/testing/btest/Baseline/cluster.websocket.metadata/..client-metadata.out @@ -0,0 +1,5 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +Connected! +ack {'type': 'ack', 'endpoint': 'endpoint', 'version': 'endpoint'} +ping {'type': 'data-message', 'topic': '/test/pings/', '@data-type': 'vector', 'data': [{'@data-type': 'count', 'data': 1}, {'@data-type': 'count', 'data': 1}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'ping'}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'fourty-two'}, {'@data-type': 'count', 'data': 42}]}]}]} +pong {'type': 'data-message', 'topic': '/test/pongs/', '@data-type': 'vector', 'data': [{'@data-type': 'count', 'data': 1}, {'@data-type': 'count', 'data': 1}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'pong'}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'fourty-two fourty-two'}, {'@data-type': 'count', 'data': 84}]}, {'@data-type': 'vector', 'data': [{'@data-type': 'vector', 'data': [{'@data-type': 'count', 'data': 1}, {'@data-type': 'timestamp', 'data': '1969-12-31T23:59:59.000'}]}]}]}]} diff --git a/testing/btest/Baseline/cluster.websocket.metadata/..client-no-metadata..stderr b/testing/btest/Baseline/cluster.websocket.metadata/..client-no-metadata..stderr new file mode 100644 index 0000000000..49d861c74c --- /dev/null +++ b/testing/btest/Baseline/cluster.websocket.metadata/..client-no-metadata..stderr @@ -0,0 +1 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. diff --git a/testing/btest/Baseline/cluster.websocket.metadata/..client-no-metadata.out b/testing/btest/Baseline/cluster.websocket.metadata/..client-no-metadata.out new file mode 100644 index 0000000000..6cd8af058e --- /dev/null +++ b/testing/btest/Baseline/cluster.websocket.metadata/..client-no-metadata.out @@ -0,0 +1,5 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +Connected! +ack {'type': 'ack', 'endpoint': 'endpoint', 'version': 'endpoint'} +ping {'type': 'data-message', 'topic': '/test/pings/', '@data-type': 'vector', 'data': [{'@data-type': 'count', 'data': 1}, {'@data-type': 'count', 'data': 1}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'ping'}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'fourty-two'}, {'@data-type': 'count', 'data': 42}]}]}]} +pong {'type': 'data-message', 'topic': '/test/pongs/', '@data-type': 'vector', 'data': [{'@data-type': 'count', 'data': 1}, {'@data-type': 'count', 'data': 1}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'pong'}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'fourty-two fourty-two'}, {'@data-type': 'count', 'data': 84}]}]}]} diff --git a/testing/btest/Baseline/cluster.websocket.metadata/..manager-metadata-from-client..stderr b/testing/btest/Baseline/cluster.websocket.metadata/..manager-metadata-from-client..stderr new file mode 100644 index 0000000000..ad8891b254 --- /dev/null +++ b/testing/btest/Baseline/cluster.websocket.metadata/..manager-metadata-from-client..stderr @@ -0,0 +1,2 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +, line 1: received termination signal diff --git a/testing/btest/Baseline/cluster.websocket.metadata/..manager-metadata-from-client.out b/testing/btest/Baseline/cluster.websocket.metadata/..manager-metadata-from-client.out new file mode 100644 index 0000000000..07b0900c71 --- /dev/null +++ b/testing/btest/Baseline/cluster.websocket.metadata/..manager-metadata-from-client.out @@ -0,0 +1,4 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +Cluster::websocket_client_added, [/test/pongs/, /zeek/wstest/ws1/] +ping: fourty-two, 42 (metadata=[[id=EventMetadata::NETWORK_TIMESTAMP, val=6162.0]]), sending pong... +Cluster::websocket_client_lost diff --git a/testing/btest/Baseline/cluster.websocket.metadata/..manager-metadata..stderr b/testing/btest/Baseline/cluster.websocket.metadata/..manager-metadata..stderr new file mode 100644 index 0000000000..ad8891b254 --- /dev/null +++ b/testing/btest/Baseline/cluster.websocket.metadata/..manager-metadata..stderr @@ -0,0 +1,2 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +, line 1: received termination signal diff --git a/testing/btest/Baseline/cluster.websocket.metadata/..manager-metadata.out b/testing/btest/Baseline/cluster.websocket.metadata/..manager-metadata.out new file mode 100644 index 0000000000..bd0e5c02a5 --- /dev/null +++ b/testing/btest/Baseline/cluster.websocket.metadata/..manager-metadata.out @@ -0,0 +1,4 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +Cluster::websocket_client_added, [/test/pongs/, /zeek/wstest/ws1/] +ping: fourty-two, 42 (metadata=[]), sending pong... +Cluster::websocket_client_lost diff --git a/testing/btest/Baseline/cluster.websocket.metadata/..manager-no-metadata..stderr b/testing/btest/Baseline/cluster.websocket.metadata/..manager-no-metadata..stderr new file mode 100644 index 0000000000..e3f6131b1d --- /dev/null +++ b/testing/btest/Baseline/cluster.websocket.metadata/..manager-no-metadata..stderr @@ -0,0 +1,2 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +received termination signal diff --git a/testing/btest/Baseline/cluster.websocket.metadata/..manager-no-metadata.out b/testing/btest/Baseline/cluster.websocket.metadata/..manager-no-metadata.out new file mode 100644 index 0000000000..bd0e5c02a5 --- /dev/null +++ b/testing/btest/Baseline/cluster.websocket.metadata/..manager-no-metadata.out @@ -0,0 +1,4 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +Cluster::websocket_client_added, [/test/pongs/, /zeek/wstest/ws1/] +ping: fourty-two, 42 (metadata=[]), sending pong... +Cluster::websocket_client_lost diff --git a/testing/btest/cluster/websocket/bad-event-args.zeek b/testing/btest/cluster/websocket/bad-event-args.zeek index ae72dfdbb6..f9ecd042de 100644 --- a/testing/btest/cluster/websocket/bad-event-args.zeek +++ b/testing/btest/cluster/websocket/bad-event-args.zeek @@ -105,7 +105,7 @@ def run(ws_url): # This should be good ping(string, count) ws.send(json.dumps(make_ping([{"@data-type": "string", "data": "Hello"}, {"@data-type": "count", "data": 42}]))) pong = json.loads(ws.recv()) - name, args, _ = pong["data"][2]["data"] + name, args = pong["data"][2]["data"] print("pong", name, args) # This one fails again diff --git a/testing/btest/cluster/websocket/metadata.zeek b/testing/btest/cluster/websocket/metadata.zeek new file mode 100644 index 0000000000..dca18a41a1 --- /dev/null +++ b/testing/btest/cluster/websocket/metadata.zeek @@ -0,0 +1,121 @@ +# @TEST-DOC: Run a single node cluster (manager) with a websocket server and have a single client connect to check the metadata it receives. +# +# @TEST-REQUIRES: have-zeromq +# @TEST-REQUIRES: python3 -c 'import websockets.sync' +# +# @TEST-GROUP: cluster-zeromq +# +# @TEST-PORT: XPUB_PORT +# @TEST-PORT: XSUB_PORT +# @TEST-PORT: LOG_PULL_PORT +# @TEST-PORT: WEBSOCKET_PORT +# +# @TEST-EXEC: cp $FILES/zeromq/cluster-layout-simple.zeek cluster-layout.zeek +# @TEST-EXEC: cp $FILES/zeromq/test-bootstrap.zeek zeromq-test-bootstrap.zeek +# @TEST-EXEC: cp $FILES/ws/wstest.py . +# +# @TEST-EXEC: zeek -b --parse-only manager.zeek +# @TEST-EXEC: python3 -m py_compile client.py +# +# @TEST-EXEC: btest-bg-run manager-no-metadata "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=manager zeek -b ../manager.zeek >out" +# @TEST-EXEC: btest-bg-run client-no-metadata "python3 ../client.py >out" +# +# @TEST-EXEC: btest-bg-wait 30 +# @TEST-EXEC: btest-diff ./manager-no-metadata/out +# @TEST-EXEC: btest-diff ./manager-no-metadata/.stderr +# @TEST-EXEC: btest-diff ./client-no-metadata/out +# @TEST-EXEC: btest-diff ./client-no-metadata/.stderr +# +# @TEST-EXEC: btest-bg-run manager-metadata "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=manager zeek -b ../manager.zeek EventMetadata::add_network_timestamp=T >out" +# @TEST-EXEC: btest-bg-run client-metadata "python3 ../client.py >out" +# +# @TEST-EXEC: btest-bg-wait 30 +# @TEST-EXEC: btest-diff ./manager-metadata/out +# @TEST-EXEC: btest-diff ./manager-metadata/.stderr +# @TEST-EXEC: btest-diff ./client-metadata/out +# @TEST-EXEC: btest-diff ./client-metadata/.stderr +# +# @TEST-EXEC: btest-bg-run manager-metadata-from-client "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=manager zeek -b ../manager.zeek EventMetadata::add_network_timestamp=T >out" +# @TEST-EXEC: btest-bg-run client-metadata-from-client "NETWORK_TIMESTAMP=1970-01-01T01:42:42 python3 ../client.py >out" + +# @TEST-EXEC: btest-bg-wait 30 +# @TEST-EXEC: btest-diff ./manager-metadata-from-client/out +# @TEST-EXEC: btest-diff ./manager-metadata-from-client/.stderr +# @TEST-EXEC: btest-diff ./client-metadata-from-client/out +# @TEST-EXEC: btest-diff ./client-metadata-from-client/.stderr + + +# @TEST-START-FILE manager.zeek +@load ./zeromq-test-bootstrap +redef exit_only_after_terminate = T; + +redef allow_network_time_forward = F; + +global ping: event(msg: string, c: count) &is_used; +global pong: event(msg: string, c: count) &is_used; + +event zeek_init() + { + set_network_time(double_to_time(4711.0)); + + Cluster::subscribe("/test/pings/"); + Cluster::listen_websocket([$listen_addr=127.0.0.1, $listen_port=to_port(getenv("WEBSOCKET_PORT"))]); + } + +event ping(msg: string, n: count) &is_used + { + print fmt("ping: %s, %s (metadata=%s), sending pong...", msg, n, EventMetadata::current_all()); + Cluster::publish("/test/pongs/", pong, msg + " " + msg, n + n); + } + +event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions: string_vec) + { + print "Cluster::websocket_client_added", subscriptions; + } + +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) + { + print "Cluster::websocket_client_lost"; + terminate(); + } +# @TEST-END-FILE + + +# @TEST-START-FILE client.py +import os +import wstest + +def run(ws_url): + with wstest.connect("ws1", ws_url) as c: + print("Connected!") + ack = c.hello_v1(["/test/pongs/"]) + assert "type" in ack + assert ack["type"] == "ack" + assert "endpoint" in ack + assert "version" in ack + + ack["endpoint"] = "endpoint" + ack["version"] = "endpoint" + print("ack", ack) + ping = wstest.build_event_v1("/test/pings/", "ping", ["fourty-two", 42]) + + if ts_str := os.environ.get("NETWORK_TIMESTAMP"): + # Sneak timestamp metadata into the ping if the env variable is set + ping["data"][2]["data"] += [{ + "@data-type": "vector", + "data": [{ + "@data-type": "vector", "data": [ + {"@data-type": "count", "data": 1}, + {"@data-type": "timestamp", "data": ts_str} + ], + }] + }] + + print("ping", ping) + c.send_json(ping) + pong = c.recv_json() + print("pong", pong) + +if __name__ == "__main__": + wstest.main(run, wstest.WS4_URL_V1) +# @TEST-END-FILE From 9a7678f15a9227c13b2aa87072089cbc46b5e5c9 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Wed, 20 Aug 2025 19:31:20 +0200 Subject: [PATCH 2/2] cluster/Backend: Fallback to current network time when current event has not timestamp When a WebSocket client sends an event to Zeek without explicit network timestamp metadata, Zeek would use -1.0 as a timestamp for any events published while handling this event. Instead, it seems far more sensible to use the current network time in that scenario. --- src/cluster/Backend.cc | 13 +++++++++++-- .../..client-metadata.out | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/cluster/Backend.cc b/src/cluster/Backend.cc index 70f3d7d87c..1f9b9567e0 100644 --- a/src/cluster/Backend.cc +++ b/src/cluster/Backend.cc @@ -132,10 +132,19 @@ std::optional Backend::MakeClusterEvent(FuncValPtr handler, ArgsSpan args * * @J-Gras prefers the current behavior. @awelzel wonders if there should * be an opt-in/opt-out for this behavior. Procrastinating it for now. + * + * In any case, if the current event has no timestamp information + * (detail::NO_TIMESTAMP is -1.0), use the current network time for + * the outgoing event instead as network timestamp metadata. */ zeek::detail::EventMetadataVectorPtr meta; - if ( zeek::BifConst::EventMetadata::add_network_timestamp ) - meta = zeek::detail::MakeEventMetadataVector(zeek::event_mgr.CurrentEventTime()); + if ( zeek::BifConst::EventMetadata::add_network_timestamp ) { + auto ts = zeek::event_mgr.CurrentEventTime(); + if ( ts == zeek::detail::NO_TIMESTAMP ) + ts = run_state::network_time; + + meta = zeek::detail::MakeEventMetadataVector(ts); + } return Event{eh, std::move(*checked_args), std::move(meta)}; } diff --git a/testing/btest/Baseline/cluster.websocket.metadata/..client-metadata.out b/testing/btest/Baseline/cluster.websocket.metadata/..client-metadata.out index 4ce606d056..976973e17e 100644 --- a/testing/btest/Baseline/cluster.websocket.metadata/..client-metadata.out +++ b/testing/btest/Baseline/cluster.websocket.metadata/..client-metadata.out @@ -2,4 +2,4 @@ Connected! ack {'type': 'ack', 'endpoint': 'endpoint', 'version': 'endpoint'} ping {'type': 'data-message', 'topic': '/test/pings/', '@data-type': 'vector', 'data': [{'@data-type': 'count', 'data': 1}, {'@data-type': 'count', 'data': 1}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'ping'}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'fourty-two'}, {'@data-type': 'count', 'data': 42}]}]}]} -pong {'type': 'data-message', 'topic': '/test/pongs/', '@data-type': 'vector', 'data': [{'@data-type': 'count', 'data': 1}, {'@data-type': 'count', 'data': 1}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'pong'}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'fourty-two fourty-two'}, {'@data-type': 'count', 'data': 84}]}, {'@data-type': 'vector', 'data': [{'@data-type': 'vector', 'data': [{'@data-type': 'count', 'data': 1}, {'@data-type': 'timestamp', 'data': '1969-12-31T23:59:59.000'}]}]}]}]} +pong {'type': 'data-message', 'topic': '/test/pongs/', '@data-type': 'vector', 'data': [{'@data-type': 'count', 'data': 1}, {'@data-type': 'count', 'data': 1}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'pong'}, {'@data-type': 'vector', 'data': [{'@data-type': 'string', 'data': 'fourty-two fourty-two'}, {'@data-type': 'count', 'data': 84}]}, {'@data-type': 'vector', 'data': [{'@data-type': 'vector', 'data': [{'@data-type': 'count', 'data': 1}, {'@data-type': 'timestamp', 'data': '1970-01-01T01:18:31.000'}]}]}]}]}