Skip to content

JSB SocketIO.connect supports to pass a CA cert file #17736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 21, 2017
Merged

JSB SocketIO.connect supports to pass a CA cert file #17736

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
864809f
JSB SocketIO.connect supports to pass a CA cert file
Apr 21, 2017
7e7bf57
The second parameter of SocketIO.connect function is probably a `opti…
Apr 21, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 31 additions & 6 deletions cocos/scripting/js-bindings/manual/network/jsb_socketio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,45 @@ bool js_cocos2dx_SocketIO_connect(JSContext* cx, uint32_t argc, jsval* vp)
CCLOG("JSB SocketIO.connect method called");

JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
if (argc == 1 || argc == 2)
if (argc >= 1 && argc <= 3)
{
std::string url;
std::string caFilePath;
bool ok = false;

do
ok = jsval_to_std_string(cx, args[0], &url);
JSB_PRECONDITION2( ok, cx, false, "Error processing arguments");

if (argc == 2)
{
bool ok = jsval_to_std_string(cx, args.get(0), &url);
JSB_PRECONDITION2( ok, cx, false, "Error processing arguments");
} while (0);
if (args[1].isObject())
{
// Just ignore the option argument
}
else if (args[1].isString())
{
// Assume it's CA root file path
ok = jsval_to_std_string(cx, args[1], &caFilePath);
JSB_PRECONDITION2( ok, cx, false, "Error processing arguments");
}
}

if (argc == 3)
{
// Just ignore the option argument

if (args[2].isString())
{
// Assume it's CA root file path
ok = jsval_to_std_string(cx, args[2], &caFilePath);
JSB_PRECONDITION2( ok, cx, false, "Error processing arguments");
}
}

JSB_SocketIODelegate* siodelegate = new (std::nothrow) JSB_SocketIODelegate();

CCLOG("Calling native SocketIO.connect method");
SIOClient* ret = SocketIO::connect(url, *siodelegate);
SIOClient* ret = SocketIO::connect(url, *siodelegate, caFilePath);

jsval jsret;
do
Expand Down