Skip to content
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.

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

Refactor WebSocket to support SSL (wss) #17172

Merged
merged 22 commits into from Jan 19, 2017
Merged

Conversation

@dumganhar
Copy link

dumganhar commented Jan 12, 2017

  1. Supports wss protocol
  2. Uses only one libwebsockets context, multiple wsi instances to avoid multi-thread issues
  3. Uses lws_create_vhost to create multiple virtual host, different protocols works

This PR depends on cocos2d/cocos2d-x-3rd-party-libs-bin#263

Discussion: http://discuss.cocos2d-x.org/t/websocket-supports-ssl-connections/34611

James Chen added 8 commits Jan 6, 2017
1. Supports wss protocol
2. Uses only one libwebsockets context, multiple wsi instances to avoid multi-thread issues
3. Uses lws_create_vhost to create multiple virtual host, different protocols works
…websockets libraries.
@dumganhar

This comment has been minimized.

Copy link
Author

dumganhar commented Jan 12, 2017

@minggo, please review.

James Chen added 2 commits Jan 12, 2017
…while building in release mode.
@@ -17451,7 +17447,7 @@
OTHER_LDFLAGS = "-llibsql3";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos9.1;
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios/freetype2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios/freetype2 $(SRCROOT)/../external/openssl/include/ios";
};

This comment has been minimized.

Copy link
@minggo

minggo Jan 13, 2017

Contributor

Should change template too?

This comment has been minimized.

Copy link
@dumganhar

dumganhar Jan 17, 2017

Author

Yes, we should, I have forgotten.
Does Jenkins compile template?

This comment has been minimized.

Copy link
@minggo

minggo Jan 17, 2017

Contributor

no, jenkins doesn't compile template to reduce compiling time

This comment has been minimized.

Copy link
@dumganhar

dumganhar Jan 19, 2017

Author

@minggo, I tested iOS template, it worked fine without any modifications.

James Chen added 12 commits Jan 16, 2017
@minggo minggo merged commit b1f2a05 into cocos2d:v3 Jan 19, 2017
2 checks passed
2 checks passed
Jenkins CI Build successfully!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@dhb118

This comment has been minimized.

Copy link
Contributor

dhb118 commented Jan 23, 2017

compile fail at cocos2d_tests.xcodeproj target 'cpp-tests Mac'
xcode version:8.2 beta
macOS SDK:10.12
e8dd3a13-61e3-4fd6-b685-e998aa6a8d36

stevetranby added a commit to stevetranby/cocos2d-x that referenced this pull request Jan 25, 2017
…futurePRs

* commit '690db56f44997830e422fd66b8c9aeb8056d16ed':
  Merge v3.14.1 (cocos2d#17231)
  Fix typo in RenderTexture: "Bufffer" -> "Buffer" (cocos2d#17235)
  Fix typos in local variables (cocos2d#17236)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#17232)
  Refactor WebSocket to support SSL (wss) (cocos2d#17172)
  Prevent the compilation of NavMeshTest if CC_USE_PHYSICS=0. (cocos2d#17205)
  Solve the compile error when building platform tizen. (cocos2d#17216)
  Update the reference of submodule cocos2d-console. (cocos2d#17212)
  Fix warnings about implicit conversion loses integer precision (cocos2d#17220)
  Fix misspelling of setFirstFocusedWidget function (cocos2d#17219)
  Fix typo in variable name (cocos2d#17218)
  check pointer before using (cocos2d#17215)

# Conflicts:
#	CHANGELOG
#	build/cocos2d_libs.xcodeproj/project.pbxproj
#	cocos/3d/CCTerrain.cpp
#	cocos/cocos2d.cpp
#	cocos/network/WebSocket.cpp
#	docs/RELEASE_NOTES_CN.md
#	docs/doxygen.config
#	tools/cocos2d-console
@dumganhar

This comment has been minimized.

Copy link
Author

dumganhar commented Feb 3, 2017

@dhb118, I guess you're using git. It's a bug of download-deps.py, I fixed it at #17247 .
You just need to pull the latest code, and execute download-deps.py again.

@dumganhar dumganhar deleted the dumganhar:refactor/wss-support branch Feb 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.