Use org.rdk.cobalt.1.x for json interface functions
* plus some other build fixes
Change-Id: I748c84ef928d7a8afe048db6ce21438710ccb43d
diff --git a/wsrpc/CMakeLists.txt b/wsrpc/CMakeLists.txt
index 25ebd46..dfd5dbf 100644
--- a/wsrpc/CMakeLists.txt
+++ b/wsrpc/CMakeLists.txt
@@ -22,7 +22,7 @@
set(CMAKE_CXX_STANDARD 14)
set(CXX_STANDARD_REQUIRED YES)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -g -O0")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -g")
include_directories(.)
diff --git a/wsrpc/README.md b/wsrpc/README.md
index 3331031..0ab3cfe 100644
--- a/wsrpc/README.md
+++ b/wsrpc/README.md
@@ -12,12 +12,12 @@
## JSON websocket interface
JSON interface schema and docs: see ./docs/ subdir.
### example: Register and receive events
-> wscat -c ws://127.0.0.1:10111/jsonrpc -x '{"jsonrpc":"2.0","id":1,"method":"com.libertyglobal.rdk.cobalt.1.register", "params": { "event": "StateEvent", "id": "events.1" } }' -w 1000
+> wscat -c ws://127.0.0.1:10111/jsonrpc -x '{"jsonrpc":"2.0","id":1,"method":"org.rdk.cobalt.1.register", "params": { "event": "StateEvent", "id": "events.1" } }' -w 1000
### example: Suspend/Resume/Stop cobalt
-> wscat -c ws://127.0.0.1:10111/jsonrpc -x '{"jsonrpc":"2.0","id":1,"method":"com.libertyglobal.rdk.cobalt.1.suspend" }
+> wscat -c ws://127.0.0.1:10111/jsonrpc -x '{"jsonrpc":"2.0","id":1,"method":"org.rdk.cobalt.1.suspend" }
>
-> wscat -c ws://127.0.0.1:10111/jsonrpc -x '{"jsonrpc":"2.0","id":1,"method":"com.libertyglobal.rdk.cobalt.1.resume" }
+> wscat -c ws://127.0.0.1:10111/jsonrpc -x '{"jsonrpc":"2.0","id":1,"method":"org.rdk.cobalt.1.resume" }
>
-> wscat -c ws://127.0.0.1:10111/jsonrpc -x '{"jsonrpc":"2.0","id":1,"method":"com.libertyglobal.rdk.cobalt.1.stop" }
+> wscat -c ws://127.0.0.1:10111/jsonrpc -x '{"jsonrpc":"2.0","id":1,"method":"org.rdk.cobalt.1.stop" }
>
\ No newline at end of file
diff --git a/wsrpc/cobalt_rpc_ws.cc b/wsrpc/cobalt_rpc_ws.cc
index ee5c206..fde8479 100644
--- a/wsrpc/cobalt_rpc_ws.cc
+++ b/wsrpc/cobalt_rpc_ws.cc
@@ -19,6 +19,7 @@
#include <exception>
#include <memory>
#include "unistd.h"
+#include <cstring>
#include "logging.h"
#include "libcobalt.h"
diff --git a/wsrpc/cobalt_rpc_ws_server.h b/wsrpc/cobalt_rpc_ws_server.h
index 08db484..04f0c3a 100644
--- a/wsrpc/cobalt_rpc_ws_server.h
+++ b/wsrpc/cobalt_rpc_ws_server.h
@@ -31,7 +31,7 @@
#include <rpcserver/IAbstractRpcServer.h>
#include <rpcserver/WsRpcServerBuilder.h>
-#define RPC_METHOD_BASE "com.libertyglobal.rdk.cobalt.1."
+#define RPC_METHOD_BASE "org.rdk.cobalt.1."
using namespace rpcserver;
diff --git a/wsrpc/docs/cobalt-wsrpc.json b/wsrpc/docs/cobalt-wsrpc.json
index 4f38c12..dd37846 100644
--- a/wsrpc/docs/cobalt-wsrpc.json
+++ b/wsrpc/docs/cobalt-wsrpc.json
@@ -3,7 +3,7 @@
"jsonrpc": "2.0",
"info": {
"title": "cobalt-wsrpc API",
- "class": "com.libertyglobal.rdk.cobalt",
+ "class": "org.rdk.cobalt",
"description": "cobalt-wsrpc JSON RPC 2.0 interface",
"version": "0.0.1"
},
diff --git a/wsrpc/docs/cobalt-wsrpcAPI.md b/wsrpc/docs/cobalt-wsrpcAPI.md
index 780c1a4..3e64007 100644
--- a/wsrpc/docs/cobalt-wsrpcAPI.md
+++ b/wsrpc/docs/cobalt-wsrpcAPI.md
@@ -18,7 +18,7 @@
<a name="head.Methods"></a>
# Methods
-The following methods are provided by the com.libertyglobal.rdk.cobalt interface:
+The following methods are provided by the org.rdk.cobalt interface:
| Method | Description |
| :-------- | :-------- |
@@ -65,7 +65,7 @@
{
"jsonrpc": "2.0",
"id": 1234567890,
- "method": "com.libertyglobal.rdk.cobalt.1.stop",
+ "method": "org.rdk.cobalt.1.stop",
"params": null
}
```
@@ -112,7 +112,7 @@
{
"jsonrpc": "2.0",
"id": 1234567890,
- "method": "com.libertyglobal.rdk.cobalt.1.suspend",
+ "method": "org.rdk.cobalt.1.suspend",
"params": null
}
```
@@ -159,7 +159,7 @@
{
"jsonrpc": "2.0",
"id": 1234567890,
- "method": "com.libertyglobal.rdk.cobalt.1.resume",
+ "method": "org.rdk.cobalt.1.resume",
"params": null
}
```
@@ -208,7 +208,7 @@
{
"jsonrpc": "2.0",
"id": 1234567890,
- "method": "com.libertyglobal.rdk.cobalt.1.getState",
+ "method": "org.rdk.cobalt.1.getState",
"params": null
}
```
@@ -257,7 +257,7 @@
{
"jsonrpc": "2.0",
"id": 1234567890,
- "method": "com.libertyglobal.rdk.cobalt.1.getUrl",
+ "method": "org.rdk.cobalt.1.getUrl",
"params": null
}
```
@@ -305,7 +305,7 @@
{
"jsonrpc": "2.0",
"id": 1234567890,
- "method": "com.libertyglobal.rdk.cobalt.1.deepLink",
+ "method": "org.rdk.cobalt.1.deepLink",
"params": {
"data": ""
}
@@ -355,7 +355,7 @@
{
"jsonrpc": "2.0",
"id": 1234567890,
- "method": "com.libertyglobal.rdk.cobalt.1.register",
+ "method": "org.rdk.cobalt.1.register",
"params": {
"event": "StateEvent",
"id": "events.1"
@@ -407,7 +407,7 @@
{
"jsonrpc": "2.0",
"id": 1234567890,
- "method": "com.libertyglobal.rdk.cobalt.1.unregister",
+ "method": "org.rdk.cobalt.1.unregister",
"params": {
"event": "StateEvent",
"id": "events.1"
@@ -457,7 +457,7 @@
{
"jsonrpc": "2.0",
"id": 1234567890,
- "method": "com.libertyglobal.rdk.cobalt.1.getListeners"
+ "method": "org.rdk.cobalt.1.getListeners"
}
```
@@ -483,7 +483,7 @@
Notifications are autonomous events, triggered by the internals of the implementation, and broadcasted via JSON-RPC to all registered observers.
-The following events are provided by the com.libertyglobal.rdk.cobalt interface:
+The following events are provided by the org.rdk.cobalt interface:
| Event | Description |
| :-------- | :-------- |
