Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents fd94f11 + c66e77e commit 31bbc94515e0b9fecdbf970f3ee52d0a7c243512 Enda Mannion committed Mar 14, 2012
Showing with 39,596 additions and 29,585 deletions.
  1. +12 −0 README
  2. +6 −0 SConstruct
  3. +1,058 −0 native/alder/config/system-headers
  4. +1,058 −0 native/alder/js/src/config/system-headers
  5. +607 −0 native/alder/toolkit/library/Makefile.in
  6. +0 −99 src/sipcc/core/common/xml_util.c
  7. +0 −982 src/sipcc/plat/common/libxml_parser.c
  8. +410 −0 tests/roapproxy/SConstruct
  9. +8,981 −0 tests/roapproxy/libwebsockets-roap-server/jquery-1.6.2.js
  10. +556 −0 tests/roapproxy/libwebsockets-roap-server/jquery-ui-1.8.16.custom.min.js
  11. +482 −0 tests/roapproxy/libwebsockets-roap-server/json2.js
  12. +436 −0 tests/roapproxy/libwebsockets-roap-server/roap.html
  13. +82 −0 tests/roapproxy/roap/Logger.cpp
  14. +14 −9 src/sipcc/core/includes/xml_util.h → tests/roapproxy/roap/Logger.h
  15. +13 −0 tests/roapproxy/roap/common.h
  16. +144 −0 tests/roapproxy/roap/incomingroap.cpp
  17. +54 −0 tests/roapproxy/roap/incomingroap.h
  18. +212 −0 tests/roapproxy/roap/jsonparser.cpp
  19. +53 −0 tests/roapproxy/roap/jsonparser.h
  20. +190 −0 tests/roapproxy/roap/outgoingroap.cpp
  21. +74 −0 tests/roapproxy/roap/outgoingroap.h
  22. +603 −0 tests/roapproxy/roap/roapapp.cpp
  23. +47 −0 tests/roapproxy/roap/roapapp.h
  24. +652 −0 tests/roapproxy/roap/sipcc_controller.cpp
  25. +178 −0 tests/roapproxy/roap/sipcc_controller.h
  26. +71 −82 src/sipcc/include/xml_parser.h → tests/roapproxy/roap/sockporting.cpp
  27. +68 −0 tests/roapproxy/roap/sockporting.h
  28. +82 −0 third_party/libwebsocket/SConstruct_libwebsocket
  29. +200 −0 third_party/libwebsocket/libwebsocketswin32/base64-decode.c
  30. +339 −0 third_party/libwebsocket/libwebsocketswin32/client-handshake.c
  31. +150 −0 third_party/libwebsocket/libwebsocketswin32/extension-deflate-stream.c
  32. +18 −0 third_party/libwebsocket/libwebsocketswin32/extension-deflate-stream.h
  33. +1,223 −0 third_party/libwebsocket/libwebsocketswin32/extension-x-google-mux.c
  34. +96 −0 third_party/libwebsocket/libwebsocketswin32/extension-x-google-mux.h
  35. +22 −0 third_party/libwebsocket/libwebsocketswin32/extension.c
  36. +733 −0 third_party/libwebsocket/libwebsocketswin32/handshake.c
  37. +3,108 −0 third_party/libwebsocket/libwebsocketswin32/libwebsockets.c
  38. +707 −0 third_party/libwebsocket/libwebsocketswin32/libwebsockets.h
  39. +217 −0 third_party/libwebsocket/libwebsocketswin32/md5.c
  40. +1,944 −0 third_party/libwebsocket/libwebsocketswin32/parsers.c
  41. +430 −0 third_party/libwebsocket/libwebsocketswin32/private-libwebsockets.h
  42. +329 −0 third_party/libwebsocket/libwebsocketswin32/sha-1.c
  43. +149 −0 third_party/libwebsocket/win32port/win32helpers/getopt.c
  44. +36 −0 third_party/libwebsocket/win32port/win32helpers/getopt.h
  45. +228 −0 third_party/libwebsocket/win32port/win32helpers/getopt_long.c
  46. +48 −0 third_party/libwebsocket/win32port/win32helpers/gettimeofday.c
  47. +21 −0 third_party/libwebsocket/win32port/win32helpers/gettimeofday.h
  48. +1 −0 third_party/libwebsocket/win32port/win32helpers/netdb.h
  49. 0 third_party/libwebsocket/win32port/win32helpers/strings.h
  50. +1 −0 third_party/libwebsocket/win32port/win32helpers/sys/time.h
  51. 0 third_party/libwebsocket/win32port/win32helpers/unistd.h
  52. +95 −0 third_party/libwebsocket/win32port/win32helpers/websock-w32.c
  53. +32 −0 third_party/libwebsocket/win32port/win32helpers/websock-w32.h
  54. +169 −0 third_party/libwebsocket/zlib/adler32.c
  55. +80 −0 third_party/libwebsocket/zlib/compress.c
  56. +442 −0 third_party/libwebsocket/zlib/crc32.c
  57. +441 −0 third_party/libwebsocket/zlib/crc32.h
  58. +1,834 −0 third_party/libwebsocket/zlib/deflate.c
  59. +342 −0 third_party/libwebsocket/zlib/deflate.h
  60. +25 −0 third_party/libwebsocket/zlib/gzclose.c
  61. +132 −0 third_party/libwebsocket/zlib/gzguts.h
  62. +1,005 −0 third_party/libwebsocket/zlib/gzio.c
  63. +537 −0 third_party/libwebsocket/zlib/gzlib.c
  64. +653 −0 third_party/libwebsocket/zlib/gzread.c
  65. +531 −0 third_party/libwebsocket/zlib/gzwrite.c
  66. +632 −0 third_party/libwebsocket/zlib/infback.c
  67. +340 −0 third_party/libwebsocket/zlib/inffast.c
  68. +11 −0 third_party/libwebsocket/zlib/inffast.h
  69. +94 −0 third_party/libwebsocket/zlib/inffixed.h
  70. +1,480 −0 third_party/libwebsocket/zlib/inflate.c
  71. +122 −0 third_party/libwebsocket/zlib/inflate.h
  72. +330 −0 third_party/libwebsocket/zlib/inftrees.c
  73. +62 −0 third_party/libwebsocket/zlib/inftrees.h
  74. +1,244 −0 third_party/libwebsocket/zlib/trees.c
  75. +128 −0 third_party/libwebsocket/zlib/trees.h
  76. +59 −0 third_party/libwebsocket/zlib/uncompr.c
  77. +428 −0 third_party/libwebsocket/zlib/zconf.h
  78. +1,613 −0 third_party/libwebsocket/zlib/zlib.h
  79. +318 −0 third_party/libwebsocket/zlib/zutil.c
  80. +274 −0 third_party/libwebsocket/zlib/zutil.h
  81. +0 −96 third_party/libxml2/include/libxml/DOCBparser.h
  82. +0 −304 third_party/libxml2/include/libxml/HTMLparser.h
  83. +0 −147 third_party/libxml2/include/libxml/HTMLtree.h
  84. +0 −173 third_party/libxml2/include/libxml/SAX.h
  85. +0 −176 third_party/libxml2/include/libxml/SAX2.h
  86. +0 −126 third_party/libxml2/include/libxml/c14n.h
  87. +0 −182 third_party/libxml2/include/libxml/catalog.h
  88. +0 −230 third_party/libxml2/include/libxml/chvalid.h
  89. +0 −217 third_party/libxml2/include/libxml/debugXML.h
  90. +0 −69 third_party/libxml2/include/libxml/dict.h
  91. +0 −226 third_party/libxml2/include/libxml/encoding.h
  92. +0 −150 third_party/libxml2/include/libxml/entities.h
  93. +0 −502 third_party/libxml2/include/libxml/globals.h
  94. +0 −233 third_party/libxml2/include/libxml/hash.h
  95. +0 −137 third_party/libxml2/include/libxml/list.h
  96. +0 −143 third_party/libxml2/include/libxml/nanoftp.h
  97. +0 −81 third_party/libxml2/include/libxml/nanohttp.h
  98. +0 −1,235 third_party/libxml2/include/libxml/parser.h
  99. +0 −611 third_party/libxml2/include/libxml/parserInternals.h
  100. +0 −100 third_party/libxml2/include/libxml/pattern.h
  101. +0 −213 third_party/libxml2/include/libxml/relaxng.h
  102. +0 −958 third_party/libxml2/include/libxml/schemasInternals.h
  103. +0 −142 third_party/libxml2/include/libxml/schematron.h
  104. +0 −84 third_party/libxml2/include/libxml/threads.h
  105. +0 −1,252 third_party/libxml2/include/libxml/tree.h
  106. +0 −94 third_party/libxml2/include/libxml/uri.h
  107. +0 −458 third_party/libxml2/include/libxml/valid.h
  108. +0 −129 third_party/libxml2/include/libxml/xinclude.h
  109. +0 −189 third_party/libxml2/include/libxml/xlink.h
  110. +0 −360 third_party/libxml2/include/libxml/xmlIO.h
  111. +0 −146 third_party/libxml2/include/libxml/xmlautomata.h
  112. +0 −944 third_party/libxml2/include/libxml/xmlerror.h
  113. +0 −162 third_party/libxml2/include/libxml/xmlexports.h
  114. +0 −224 third_party/libxml2/include/libxml/xmlmemory.h
  115. +0 −57 third_party/libxml2/include/libxml/xmlmodule.h
  116. +0 −424 third_party/libxml2/include/libxml/xmlreader.h
  117. +0 −222 third_party/libxml2/include/libxml/xmlregexp.h
  118. +0 −87 third_party/libxml2/include/libxml/xmlsave.h
  119. +0 −218 third_party/libxml2/include/libxml/xmlschemas.h
  120. +0 −151 third_party/libxml2/include/libxml/xmlschemastypes.h
  121. +0 −140 third_party/libxml2/include/libxml/xmlstring.h
  122. +0 −202 third_party/libxml2/include/libxml/xmlunicode.h
  123. +0 −458 third_party/libxml2/include/libxml/xmlversion.h
  124. +0 −485 third_party/libxml2/include/libxml/xmlwriter.h
  125. +0 −546 third_party/libxml2/include/libxml/xpath.h
  126. +0 −630 third_party/libxml2/include/libxml/xpathInternals.h
  127. +0 −114 third_party/libxml2/include/libxml/xpointer.h
  128. +0 −96 third_party/libxml2/include_darwin/libxml/DOCBparser.h
  129. +0 −303 third_party/libxml2/include_darwin/libxml/HTMLparser.h
  130. +0 −147 third_party/libxml2/include_darwin/libxml/HTMLtree.h
  131. +0 −173 third_party/libxml2/include_darwin/libxml/SAX.h
  132. +0 −176 third_party/libxml2/include_darwin/libxml/SAX2.h
  133. +0 −115 third_party/libxml2/include_darwin/libxml/c14n.h
  134. +0 −182 third_party/libxml2/include_darwin/libxml/catalog.h
  135. +0 −230 third_party/libxml2/include_darwin/libxml/chvalid.h
  136. +0 −217 third_party/libxml2/include_darwin/libxml/debugXML.h
  137. +0 −69 third_party/libxml2/include_darwin/libxml/dict.h
  138. +0 −226 third_party/libxml2/include_darwin/libxml/encoding.h
  139. +0 −150 third_party/libxml2/include_darwin/libxml/entities.h
  140. +0 −491 third_party/libxml2/include_darwin/libxml/globals.h
  141. +0 −233 third_party/libxml2/include_darwin/libxml/hash.h
  142. +0 −137 third_party/libxml2/include_darwin/libxml/list.h
  143. +0 −143 third_party/libxml2/include_darwin/libxml/nanoftp.h
  144. +0 −81 third_party/libxml2/include_darwin/libxml/nanohttp.h
  145. +0 −1,226 third_party/libxml2/include_darwin/libxml/parser.h
  146. +0 −611 third_party/libxml2/include_darwin/libxml/parserInternals.h
  147. +0 −100 third_party/libxml2/include_darwin/libxml/pattern.h
  148. +0 −213 third_party/libxml2/include_darwin/libxml/relaxng.h
  149. +0 −958 third_party/libxml2/include_darwin/libxml/schemasInternals.h
  150. +0 −142 third_party/libxml2/include_darwin/libxml/schematron.h
  151. +0 −84 third_party/libxml2/include_darwin/libxml/threads.h
  152. +0 −1,252 third_party/libxml2/include_darwin/libxml/tree.h
  153. +0 −94 third_party/libxml2/include_darwin/libxml/uri.h
  154. +0 −458 third_party/libxml2/include_darwin/libxml/valid.h
  155. +0 −125 third_party/libxml2/include_darwin/libxml/xinclude.h
  156. +0 −189 third_party/libxml2/include_darwin/libxml/xlink.h
  157. +0 −360 third_party/libxml2/include_darwin/libxml/xmlIO.h
  158. +0 −146 third_party/libxml2/include_darwin/libxml/xmlautomata.h
  159. +0 −944 third_party/libxml2/include_darwin/libxml/xmlerror.h
  160. +0 −157 third_party/libxml2/include_darwin/libxml/xmlexports.h
  161. +0 −224 third_party/libxml2/include_darwin/libxml/xmlmemory.h
  162. +0 −57 third_party/libxml2/include_darwin/libxml/xmlmodule.h
  163. +0 −424 third_party/libxml2/include_darwin/libxml/xmlreader.h
  164. +0 −222 third_party/libxml2/include_darwin/libxml/xmlregexp.h
  165. +0 −87 third_party/libxml2/include_darwin/libxml/xmlsave.h
  166. +0 −218 third_party/libxml2/include_darwin/libxml/xmlschemas.h
  167. +0 −151 third_party/libxml2/include_darwin/libxml/xmlschemastypes.h
  168. +0 −140 third_party/libxml2/include_darwin/libxml/xmlstring.h
  169. +0 −202 third_party/libxml2/include_darwin/libxml/xmlunicode.h
  170. +0 −458 third_party/libxml2/include_darwin/libxml/xmlversion.h
  171. +0 −485 third_party/libxml2/include_darwin/libxml/xmlwriter.h
  172. +0 −546 third_party/libxml2/include_darwin/libxml/xpath.h
  173. +0 −630 third_party/libxml2/include_darwin/libxml/xpathInternals.h
  174. +0 −114 third_party/libxml2/include_darwin/libxml/xpointer.h
View
12 README
@@ -297,3 +297,15 @@ python setup.py install
Windows
From http://www.scons.org/ download and install the scons windows installer
+ ---------------------------------------------------
+14. Using Ikran with websocket-based ROAP Proxy
+---------------------------------------------------
+
+1. Start the roap proxy firstly.
+
+2. Start firefox with ikran add-on. Enter IP:7681 in address bar to load page. the IP is roap proxy ip.
+
+3. On page load you should see the RoapProxy register and then it will do the SIP conversation
+on behalf of your browser. It currently only works for 1 call and needs to be reset between
+each call.
+
View
@@ -287,6 +287,12 @@ SCRIPT_FILES += [
'tests/testapp_softphone/SConstruct',
]
+if sys.platform in ['win32']:
+ SCRIPT_FILES += [
+ 'third_party/libwebsocket/SConstruct_libwebsocket',
+ 'tests/roapproxy/SConstruct',
+ ]
+
if sys.platform in [ 'win32', 'linux2','darwin']:
SCRIPT_FILES += [
'third_party/gtest/SConstruct_gtestd',
Oops, something went wrong.

0 comments on commit 31bbc94

Please sign in to comment.