Converted all the EQStreams into EQStreamInterfaces, dear god help us.

These rules do not appear to be true on live
They also don't look to have ever been true?

CMakeLists.txt

@@ -257,7 +257,7 @@ OPTION(EQEMU_BUILD_LOGIN "Build the login server." OFF)
 OPTION(EQEMU_BUILD_TESTS "Build utility tests." OFF)
 OPTION(EQEMU_BUILD_PERL "Build Perl parser." ON)
 OPTION(EQEMU_BUILD_LUA "Build Lua parser." ON)
-OPTION(EQEMU_BUILD_CLIENT_FILES "Build Client Inport/Export Data Programs." ON)
+OPTION(EQEMU_BUILD_CLIENT_FILES "Build Client Import/Export Data Programs." ON)
 
 #C++11 stuff
 IF(NOT MSVC)
@@ -265,8 +265,6 @@ IF(NOT MSVC)
 	IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reserved-user-defined-literal")
 	ENDIF()
-	
-	ADD_DEFINITIONS(-D__STDC_CONSTANT_MACROS)
 ENDIF(NOT MSVC)
 
 #Various definitions
@@ -325,7 +323,7 @@ IF(EQEMU_BUILD_LUA)
 	SET(BOOST_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/boost")
 
 	FIND_PACKAGE(Boost REQUIRED)
-	INCLUDE_DIRECTORIES(SYSTEM "${LUA_INCLUDE_DIR}" "${Boost_INCLUDE_DIRS}" "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/luabind")
+	INCLUDE_DIRECTORIES(SYSTEM "${LUA_INCLUDE_DIR}" "${Boost_INCLUDE_DIRS}" "luabind")
 
 	OPTION(EQEMU_SANITIZE_LUA_LIBS "Sanitize Lua Libraries (Remove OS and IO standard libraries from being able to run)." ON)
 	IF(EQEMU_SANITIZE_LUA_LIBS)
@@ -333,7 +331,11 @@ IF(EQEMU_BUILD_LUA)
 	ENDIF(EQEMU_SANITIZE_LUA_LIBS)
 ENDIF(EQEMU_BUILD_LUA)
 
-INCLUDE_DIRECTORIES(SYSTEM "${ZLIB_INCLUDE_DIRS}" "${MySQL_INCLUDE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/common/glm" "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/libwebsockets" "${CMAKE_CURRENT_SOURCE_DIR}/common/rapidjson")
+INCLUDE_DIRECTORIES(SYSTEM "${ZLIB_INCLUDE_DIRS}" "${MySQL_INCLUDE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/common/glm")
+
+IF(EQEMU_BUILD_LUA)
+    ADD_SUBDIRECTORY(luabind)
+ENDIF(EQEMU_BUILD_LUA)
 
 IF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS)
 	ADD_SUBDIRECTORY(common)
@@ -345,8 +347,6 @@ IF(EQEMU_BUILD_SERVER)
 	ADD_SUBDIRECTORY(ucs)
 	ADD_SUBDIRECTORY(queryserv)
 	ADD_SUBDIRECTORY(eqlaunch)
-	ADD_SUBDIRECTORY(dependencies)
-	ADD_SUBDIRECTORY(web_interface)
 ENDIF(EQEMU_BUILD_SERVER)
 IF(EQEMU_BUILD_LOGIN)
 	ADD_SUBDIRECTORY(loginserver)

README.md

@@ -1,54 +1,59 @@
-EQEmu
-===
+# EQEmulator Core Server
+|Travis CI (Linux)|Appveyor (Windows)   |
+|:---:|:---:|
+|[![Linux CI](https://travis-ci.org/EQEmu/Server.svg?branch=master)](https://travis-ci.org/EQEmu/Server)   |[![Windows CI](https://ci.appveyor.com/api/projects/status/d0cvokm7u732v8vl/branch/master?svg=true)](https://ci.appveyor.com/project/KimLS/server/branch/master)   |
 
-[![Linux CI](https://travis-ci.org/EQEmu/Server.svg?branch=master)](https://travis-ci.org/EQEmu/Server)
-[![Windows CI](https://ci.appveyor.com/api/projects/status/d0cvokm7u732v8vl/branch/master?svg=true)](https://ci.appveyor.com/project/KimLS/server/branch/master)
+***
 
-Overview
----
+**EQEmulator is a custom completely from-scratch open source server implementation for EverQuest built mostly on C++**
+ * MySQL/MariaDB is used as the database engine (over 200+ tables)
+ * Perl and LUA are both supported scripting languages for NPC/Player/Quest oriented events
+ * Open source database (Project EQ) has content up to expansion GoD (included in server installs)
+  * Game server environments and databases can be heavily customized to create all new experiences
+ * Hundreds of Quests/events created and maintained by Project EQ
 
-EQEmu is a custom server implementation for EverQuest
+## Server Installs
+||Windows|Linux|
+|:---:|:---:|:---:|
+|**Install Count**|![Windows Install Count](http://analytics.akkadius.com/?install_count&windows_count)|![Linux Install Count](http://analytics.akkadius.com/?install_count&linux_count)| 
+### > Windows 
+* [Easy Install](http://wiki.eqemulator.org/p?Akkas_PEQ_Server_Installer&frm=Main#from-scratch-installation-instructions-windows)
+* [Advanced Setup](http://wiki.eqemulator.org/p?Complete_Windows-based_Server_Setup_Guide)
 
-Dependencies
----
+### > Debian/Ubuntu
 
-For Windows: http://eqemu.github.io
+> wget --no-check-certificate https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/linux_installer/install.sh -O install.sh && chmod 755 install.sh && ./install.sh
 
-Login Server dependencies for Windows/Linux/OSX: http://eqemu.github.io
+### > CentOS/Fedora
 
-For Debian based distros (adjust to your local flavor):
+> curl -O https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/linux_installer/install.sh install.sh && chmod 755 install.sh && ./install.sh
 
-- libmysqlclient-dev
-- libperl-dev
-- liblua5.1-0-dev (5.2 should work as well)
-- libboost-dev
+## Supported Clients
 
-Further instructions on building the source can be found on the
-[wiki](http://wiki.eqemulator.org/i?M=Wiki).
+|Titanium Edition|Secrets of Faydwer|Seeds of Destruction|Underfoot|Rain of Fear|
+|:---:|:---:|:---:|:---:|:---:|
+|<img src="http://i.imgur.com/hrwDxoM.jpg" height="150">|<img src="http://i.imgur.com/cRDW5tn.png" height="150">|<img src="http://i.imgur.com/V48kuVn.jpg" height="150">|<img src="http://i.imgur.com/IJQ0XMa.jpg" height="150">|<img src="http://i.imgur.com/OMpHkKa.png" height="100">|
 
-Bug reports
----
-
-Please use the [issue tracker](https://github.com/EQEmu/Server/issues) provided by GitHub to send us bug
+## Bug Reports <img src="http://i.imgur.com/daf1Vjw.png" height="20">
+* Please use the [issue tracker](https://github.com/EQEmu/Server/issues) provided by GitHub to send us bug
 reports or feature requests.
+* The [EQEmu Forums](http://www.eqemulator.org/forums/) are also a place to submit and get help with bugs.
 
-The [EQEmu Forums](http://www.eqemulator.org/forums/) also have forums to submit
-bugs/get help with bugs.
+## Contributions <img src="http://image.flaticon.com/icons/png/512/25/25231.png" width="20">
 
-Contributions
----
-
-The preferred way to contribute is to fork the repo and submit a pull request on
+* The preferred way to contribute is to fork the repo and submit a pull request on
 GitHub. If you need help with your changes, you can always post on the forums or
-try IRC. You can also post unified diffs (`git diff` should do the trick) on the
+try Discord. You can also post unified diffs (`git diff` should do the trick) on the
 [Server Code Submissions](http://www.eqemulator.org/forums/forumdisplay.php?f=669)
 forum, although pull requests will be much quicker and easier on all parties.
 
-Contact
----
- - **User IRC Channel**: `#eqemu` on `irc.eqemulator.net`
- - **Developer IRC Channel**: `#eqemucoders` on `irc.eqemulator.net`
+## Contact <img src="http://gamerescape.com/wp-content/uploads/2015/06/discord.png" height="20">
 
+ - Discord Channel: https://discord.gg/QHsm7CD
+ - **User Discord Channel**: `#general`
+ - **Developer Discord Channel**: `#eqemucoders`
+
+Resources
+---
 - [EQEmulator Forums](http://www.eqemulator.org/forums)
 - [EQEmulator Wiki](http://wiki.eqemulator.org/i?M=Wiki)
-

changelog.txt

@@ -1,5 +1,99 @@
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
+== 09/12/2016 ==
+Akkadius: Massive overhaul of the update system and EQEmu Server management utility framework 
+	(known as eqemu_update.pl) now known as eqemu_server.pl
+	- eqemu_server.pl is now a general EQEmu Server management utiltiy framework that can be used
+		to extend to many purposes. It's main purpose is to simplify server management
+	- eqemu_server.pl changes:
+		- Menu has been completely changed, instead of a number based (enter number and hit enter)
+		you now type commands within the menu (Ex: 'database')
+		- Handles last mile installation for Windows Servers (See Github Readme)
+		- Handles last mile installation for Linux Servers (See Github Readme)
+			- Ubuntu
+			- Debian
+			- Fedora
+			- CentOS
+		- Now checks for Internet connection before performing web requests
+		- Database:
+			- Regular schema updates now happen automatically, if new binaries present updated
+				database schema changes, script will backup first, auto update database, and continue
+				world bootup
+			- Regular bots database schema changes now happen automatically similarily to the above
+			- Database checks can also be ran manually via the script menu
+		- CLI Arguments
+			- Arguments passed to eqemu_server.pl can execute the same name-based operations that 
+				are present in the interactive menu
+					- Example: "perl eqemu_server.pl opcodes" will download opcodes
+					- Example: "perl eqemu_server.pl backup_player_tables" will backup and export player tables
+		- Bots
+			- Bots can now be automatically setup in Linux or Windows via the 'setup_bots' command
+				- Windows will auto download binaries and install, along with installing bots db schema
+				- Linxu will auto compile binaries and install, along with installings bots db schema
+		- Utility scripts
+			- Linux now has the following utility scripts for download, available via menu 'utility_scripts'
+				and via Linux default install:
+					- server_launcher.pl
+					- server_start_dev.sh
+					- server_start.sh
+					- server_status.sh
+					- server_stop.sh 
+		- Usage analytics
+			- eqemu_server.pl now collects usage analytics, this is very helpful for our developers
+				- Example: We can see how many installs have been performed:
+					https://github.com/EQEmu/Server#server-installs
+				- This helps us see how often certain utilities are used as well
+		- Console Messages
+			- All script messages have been prefixed with a bracket action Ex: [Update] [Database] [Info]
+				to be more consistent with our log conventions
+		- 'New Server' Utility
+			- Running 'new_server' from the main menu or 'perl eqemu_server.pl new_server' while in
+				a completely new folder with just the script present, will allow a server operator
+				to initiate a full clean PEQ install in that folder. Pulling down all assets and 
+				installing a PEQ database with the name the server operator gives the prompts in the 
+				script
+	
+== 09/10/2016 ==
+noudess: Task system experience based on a % of a level did not take into
+account the hell levels rule.  Now it does.
+
+== 09/04/2016 (Changes over past few months) ==
+Akkadius: Fixed an issue where clients would crash with health marquee's
+Akkadius: Fixed issues with NPC's "ghosting" when they path
+Akkadius: Overhauled worldserver logging
+Akkadius: Pets now don't actually spawn until the player has fully entered the zone (Live-like)
+demonstar/KLS: Adjusted some background workings on how spell buff tics are synced with the client
+Uleat: Optimizations to map loading and zone times
+Uleat/Akkadius: Fixed bandolier exploit where you could equip a 2H and Shield
+mackal: Re-worked spell re-use timer logic
+mackal: Source optimizations all over, crash fixes
+mackal: Fixed some issues with illusions on zoning
+mackal: Fixed some client DOT stacking bugs
+mackal: Invis will now break on AA spell casts and item cast
+mackal: Changed how Loot response code works
+mackal: Implemented 3 additional spell gems with (Mnemonic Retention)
+mackal: Instant spells now have instrument mods
+mackal: Rate limit character saves
+mackal: Made it so items no longer do TGB (Live-like) Rule implemented to disable
+mackal: Set pet buffs limit to 30
+
+== 09/03/2016 ==
+Uleat: Changed 'Bind Wound' behavior to match the best references that I could find for post-2004 era.
+	Note: If you wish to retain the old method, source in the optional '2016_09_03_old_bind_wound_rule.sql' script file.
+
+== 08/27/2016 ==
+Kinglykrab: Added optional IP-based account exemptions.
+	- To use this system simply set World:EnableIPExemptions to true and create an entry in the ip_exemptions table.
+	- Example: exemption_ip of IP 192.168.1.4 in ip_exemptions with exemption_amount of 1 will allow only 1 account to login from IP 192.168.1.4.
+	- Note: If there is no exemption, the amount of accounts logged in from a singular IP will default to World:MaxClientsPerIP
+
+== 08/23/2016 ==
+noudess: Force mobs on a depop @ end pathgrid to still do this on idle zones.
+This makes them be more random after a zone is idle, rather than always showing
+up at start point when 1st person logs into an idle zone.  Much more like live.
+I dion't think this will be much of a performance problem.  Once they path and
+depop, no mkore cpu usage.
+
 == 08/14/2016 ==
 mackal: Implement Linked Spell Reuse Timers
 	- For whatever reason this is a bit unfriendly, but that's how it is on live.
@@ -395,10 +489,10 @@ mackal: Reworked the activated avoidace skills (riposte, dodge, etc) based on de
 	Also riposte immunity from the increase riposte chance spell effect.
 
 == 7/2/2015 ==
-KLS/Demonstar55: AA system has been rewritten fixing a ton of bugs and extending functionality while making it easier to create new AA points.
-KLS/Demonstar55: New tables are needed and so older data will need to be migrated to the new system.
-KLS/Demonstar55: The SQL saves the old aa points spent/avail/character_alt_abilities data if any server ops want to do something different than PEQ did with it.
-KLS/Demonstar55: Will try to get a wiki entry written up next week some time explaining the system but it's really not hard to follow the db tables in the meantime.
+KLS/mackal: AA system has been rewritten fixing a ton of bugs and extending functionality while making it easier to create new AA points.
+KLS/mackal: New tables are needed and so older data will need to be migrated to the new system.
+KLS/mackal: The SQL saves the old aa points spent/avail/character_alt_abilities data if any server ops want to do something different than PEQ did with it.
+KLS/mackal: Will try to get a wiki entry written up next week some time explaining the system but it's really not hard to follow the db tables in the meantime.
 
 == 7/1/2015 ==
 Akkadius: Fix an issue where emote messages would overflow the buffer of 256 by increasing the size and changing some of the initialization
@@ -428,7 +522,7 @@ Akkadius: Added DB ver 9082 with update to add npc_types texture columns if tabl
 Uleat: Added null-term declaration for character names in ENCODE(OP_CharInfo) - where appropriate
 
 == 05/20/2015 ==
-demonstar55: Bard instrument mods should be more consistent with live. Zoning will keep instrument mod for long duration buffs (selo's)
+mackal: Bard instrument mods should be more consistent with live. Zoning will keep instrument mod for long duration buffs (selo's)
 	Still need to have procs/doom effects to inherit the instrument mods from their source buff/whatever
 
 == 05/18/2015 ==
@@ -438,7 +532,7 @@ KLS: Changed how fishing locates water to hopefully be a bit more accurate at th
 Uleat: Added check to EntityList::CheckSpawnQueue() to bypass dereference if returned iterator is npc_list.end() - should fix the debug assertion failure crash
 
 == 04/30/2015 ==
-demonstar55: Implement mob and client melee push
+mackal: Implement mob and client melee push
        You can set Combat:MeleePush to false to turn off or change Combat:MeleePushChance to increase the chance an NPC can be pushed
        PCs are always pushed, need to do more testing to verify.
 
@@ -492,7 +586,7 @@ Uleat: Fix for RoF+ clients showing active 'Return Home' button when action is n
 Noudess: Starting erudites that were supposed to start in paineel were landing in erudin on Titanium. Fixed to be paineel.
 
 == 02/20/2015 ==
-demonstar55: Implement claims for RoF/RoF2 (should no longer crash the client!)
+mackal: Implement claims for RoF/RoF2 (should no longer crash the client!)
 	- fixed bugs related to claims for the rest of the clients (woo infinite loops)
 
 == 02/18/2015 ==
@@ -511,7 +605,7 @@ Notes:
 
 == 02/16/2015 ==
 Trevius: (RoF2) Bazaar Trading (Buying/Selling) is now fully functional.  Bazaar (/bazaar) search is not yet functional.
-demonstar55: (RoF2) Send the bard focus effects, note custom servers will need to fix their items, server side we still use the old system, but RoF2 wasn't showing anything with not sending focus, so send them
+mackal: (RoF2) Send the bard focus effects, note custom servers will need to fix their items, server side we still use the old system, but RoF2 wasn't showing anything with not sending focus, so send them
 
 == 02/14/2015 ==
 Trevius: (RoF2) Bazaar is now partially functional.  RoF2 clients can start/end trader mode and other clients can purchase from them.  No other functionality yet.
@@ -561,7 +655,7 @@ Akkadius: Implement Packet logs with dumps
 	See: http://wiki.eqemulator.org/p?Logging_System_Overhaul#packet-logging-levels
 
 == 02/01/2015 ==
-demonstar55: Add quest debugging to lua
+mackal: Add quest debugging to lua
 	eq.debug("Test debug level implicit 1")
 	eq.debug("Test debug level explicit 1", 1)
 	eq.debug("Test debug level explicit 2", 2)
@@ -754,7 +848,7 @@ Trevius: Finished lining up the RoF2 Player Profile Struct.  Zone times are now
 Trevius: Fixed zoning after death for RoF2.
 
 == 12/17/2014 ==
-demonstar55: Use vectors for route stuff, should be more CPU cache friendly so faster
+mackal: Use vectors for route stuff, should be more CPU cache friendly so faster
 Secrets: EQStream changes as recommended by a community member in private.
 
 == 12/15/2014 ==
@@ -764,7 +858,7 @@ Trevius: Player Corpses now saved attuned settings for Items.
 Required SQL: utils/sql/git/required/2014_12_15_multiple_table_updates.sql
 
 == 12/13/2014 ==
-demonstar55: Fix guild rank spam on zone (needed to be in OP_PP).
+mackal: Fix guild rank spam on zone (needed to be in OP_PP).
 Trevius: (RoF+) Implemented Armor Ornamentation using Hero's Forge Armor Models.  To use, create an ornamentation augment and set the herosforgemodel field in the items table.
 Trevius: (RoF+) Added command #heromodel (#hm for short) - Usage: #heromodel [hero forge model] [ [slot] ] (example: #heromodel 63)
 
@@ -772,11 +866,11 @@ Be sure to run this or there will be item loss:
 Required SQL: utils/sql/git/required/2014_12_13_inventory_table_update.sql
 
 == 12/12/2014 ==
-demonstar55: Add special attack 42, Ignore Root Aggro Rules. This allows you to root a mob and have them still use the normal aggro rules (so they will attack the one with most hate, not closest)
+mackal: Add special attack 42, Ignore Root Aggro Rules. This allows you to root a mob and have them still use the normal aggro rules (so they will attack the one with most hate, not closest)
 
 == 12/09/2014 ==
 Trevius: (RoF+) Implemented Hero's Forge Armor Models for Items.  To use, set herosforgemodel field in the item table to a model number such as 63 (for example).
-demonstar55: SoF+ swarm pets will no longer be F8able (without a hack!)
+mackal: SoF+ swarm pets will no longer be F8able (without a hack!)
 
 == 12/08/2014 ==
 Secrets: Added a feature that allows an EQ client to log in directly to World without having to enter the LoginServer, provided the 'password' field is set in WorldServer.
@@ -822,10 +916,10 @@ Trevius: Mercenaries now Dismiss, Suspend, Unsuspend, and Die correctly.
 Trevius: Mercenaries can now zone once again.
 
 == 11/17/2014 ==
-demonstar55: Correct OP_AugmentInfo reply. This fixes RoF display issue with Adventurer's Stone. Still issues with UF/SoF/SoD though.
+mackal: Correct OP_AugmentInfo reply. This fixes RoF display issue with Adventurer's Stone. Still issues with UF/SoF/SoD though.
 
 == 11/16/2014 ==
-demonstar55: fix size issue with ControlBoat_Struct and exploit fix in OP_BoardBoat
+mackal: fix size issue with ControlBoat_Struct and exploit fix in OP_BoardBoat
 
 Akkadius: Implemented Automatic Database update and versioning system
 Akkadius: Created database revision define, this is located in version.h in common #define CURRENT_BINARY_DATABASE_VERSION 9057
@@ -902,12 +996,12 @@ Optional SQL: utils/sql/git/optional/2014_11_15_SwarmPetTargetLock.sql
 
 == 11/14/2014 ==
 Secrets: Identified object size and solidtype as flags. Exported them as functions to Perl.
-demonstar55: Don't use the hack for charms that doesn't work on RoF
-demonstar55: UF too
-demonstar55: Tit
-demonstar55: SoF
-demonstar55: SoD
-demonstar55: 62 (untested)
+mackal: Don't use the hack for charms that doesn't work on RoF
+mackal: UF too
+mackal: Tit
+mackal: SoF
+mackal: SoD
+mackal: 62 (untested)
 
 == 11/13/2014 ==
 Kayen: Implemented target type (44) 'Beams' (which projects an AE infront of caster with a specified length and width).
@@ -933,7 +1027,7 @@ JJ: Implement new Live-like faction adjustment message using rule Client:UseLive
 Optional SQL: utils/sql/git/optional/2014_11_09_LiveFactionMessages.sql
 
 == 11/06/2014 ==
-demonstar55: Tracking default sort will now be correct order
+mackal: Tracking default sort will now be correct order
 Trevius: Fixed dynamic merchant list loading.  Allows any merchant to be used in any zone.
 
 == 11/03/2014 ==
@@ -957,17 +1051,17 @@ Uleat: Added Client::InterrogateInventory(). Can be invoked by #interrogateinv a
 Uleat: Fix for stacking items in a world object..added a new command option: #peekinv world - will show world container contents, if one is in use by target.
 
 == 10/20/2014 ==
-demonstar55: Inspect Buffs rank 1 will now show NPC buffs in target window (SoD+)
+mackal: Inspect Buffs rank 1 will now show NPC buffs in target window (SoD+)
 
 == 10/19/2014 ==
 Uleat: Updated command #peekinv to display item links properly in RoF clients
-demonstar55: Group Mentoring in raids
-demonstar55: Inspect Buffs (text only version) works in raid groups
-demonstar55: Make use of the Inspect Buffs op/packet. 62 SOL until someone finds its op
+mackal: Group Mentoring in raids
+mackal: Inspect Buffs (text only version) works in raid groups
+mackal: Make use of the Inspect Buffs op/packet. 62 SOL until someone finds its op
 
 == 10/18/2014==
-demonstar55: Implement group mentor, sharing leadership exp (SoF+ only)
-demonstar55: Add gaining of group leadership while in raids
+mackal: Implement group mentor, sharing leadership exp (SoF+ only)
+mackal: Add gaining of group leadership while in raids
 
 == 10/16/2014 ==
 Uleat: Fixed the auto-conversion view naming error and renamed the views in the script files. Added a fix sql for databases that auto-converted.
@@ -980,7 +1074,7 @@ Notes: I modifed the behavior of both load and drop bots to fail on the first op
 	   a few altered tables back to their original state - as of the date in the file.
 
 == 10/13/2014 ==
-demonstar55: Partially implement leadership and raids
+mackal: Partially implement leadership and raids
 	Currently working: client side only effects and stat bonuses.
 	Not working: Mark NPC, and other stuff that need extra server side support
 	Currently only UF tested (Tit and 62 may just work, others need packet work)
@@ -989,7 +1083,7 @@ demonstar55: Partially implement leadership and raids
 Akkadius: Fix for LDON Character Stat load
 
 == 10/11/2014 ==
-demonstar55: Implement Raid MOTD for UF
+mackal: Implement Raid MOTD for UF
 	Don't forget 2014_10_11_RaidMOTD.sql!
 
 == 10/09/2014 ==
@@ -1002,7 +1096,7 @@ previously and/or manually changed code, or just have a need for it to re-run, c
 ** This will only work if you haven't deleted your `character_old` table **
 
 == 10/07/2014 ==
-demonstar55: Identified tutorial flag in all charcreate packets, reworked logic to correctly set homes binds
+mackal: Identified tutorial flag in all charcreate packets, reworked logic to correctly set homes binds
 
 == 10/05/2014 ==
 Uleat: Added Server<->Corpse slot translators needed for re-enumeration (inactive until phased in)
@@ -1020,13 +1114,13 @@ Uleat: First round of Ti/6.2 translators added - needed for re-enumeration
 
 == 10/01/2014 ==
 Kayen: Exported to PERL $client->SendColoredText(color, msg)
-demonstar55: Exported SendColoredText to lua
+mackal: Exported SendColoredText to lua
 
 == 09/30/2014 ==
 Uleat: Implemented click-casting from bag slots for clients that natively support it (RoF)
 
 == 09/28/2014 ==
-demonstar55: Add support for post June 18, 2014 Hundred Hands Effect spells (they changed the formula and stuff)
+mackal: Add support for post June 18, 2014 Hundred Hands Effect spells (they changed the formula and stuff)
 set Spells:Jun182014HundredHandsRevamp to true if you're using a spell file from June 18, 2014+
 
 == 09/27/2014 ==
@@ -1035,15 +1129,15 @@ Note: identifier is the stat field in spells_new, slot is used for certain effec
 Example $mob->GetSpellStat(121, "range"); //Returns spell range
 Example $mob->GetSpellStat(121, "effectid", 1); //Returns the the value of effectid1
 This will allow you to pull almost all the data for any spell in quest files.
-demonstar55: Move the client's SetAttackTimer to the end of Client::CalcBonuses to keep the haste in sync
-demonstar55: Correct haste/slow "stacking" rules
-demonstar55: Correct SE_AttackSpeed4 to respect unslowable
-demonstar55: Make the haste be between 1-225 like the client (<100 = slow, >100 = haste) to ...
-demonstar55: Correct Hundred Hands effect and use formula provided by devs
+mackal: Move the client's SetAttackTimer to the end of Client::CalcBonuses to keep the haste in sync
+mackal: Correct haste/slow "stacking" rules
+mackal: Correct SE_AttackSpeed4 to respect unslowable
+mackal: Make the haste be between 1-225 like the client (<100 = slow, >100 = haste) to ...
+mackal: Correct Hundred Hands effect and use formula provided by devs
 
 == 09/24/2014 ==
 Uleat: Re-ordered server opcodes and handlers to give them some predictability of location (I need this for the inventory re-enumeration.)
-demonstar55: Added helper function bool EQEmu::IsTradeskill(uint32 skill)
+mackal: Added helper function bool EQEmu::IsTradeskill(uint32 skill)
 
 == 09/23/2014 ==
 Kayen: Spell recourse effects will now be applied AFTER the base spells effects have been applied (consistent with live).
@@ -1152,46 +1246,46 @@ Akkadius: Player Profile Blob to Database Conversion
 	ORDER  BY DATA DESC;
 
 == 09/20/2014 ==
-demonstar55: Fix crash in SendEnterWorld on illegally long names
-demonstar55: The client only lets you enter 15 characters for your name (UF at least)
-demonstar55: Add rule Spells:SHDProcIDOffByOne for pre-UF spell file, set to true, UF+ set to false
+mackal: Fix crash in SendEnterWorld on illegally long names
+mackal: The client only lets you enter 15 characters for your name (UF at least)
+mackal: Add rule Spells:SHDProcIDOffByOne for pre-UF spell file, set to true, UF+ set to false
 KLS: #suspend and #ban now have required messages to record the reason for the ban/suspension.
 
 == 09/19/2014 ==
-demonstar55: Added Client::Tell_StringID (used in tell queue messages)
-demonstar55: Tell queues (and offline) messages now show correctly
-demonstar55: Fix starting with capital check
+mackal: Added Client::Tell_StringID (used in tell queue messages)
+mackal: Tell queues (and offline) messages now show correctly
+mackal: Fix starting with capital check
 
 == 09/18/2014==
-demonstar55: Implement tell queues
+mackal: Implement tell queues
 	Currently set to a limit of 20 by default (World:TellQueueSize) I was unable to hit the limit on live though (100+)
 	The required SQL nukes the old tell queue table, which may or may not be in your DB
 	Optional SQL adds the rule to the DB to allow easy of change
 	Note: this does not play well with multiple sessions with the same name on (crash and relog and have multiple sessions) but normal tells don't play well either
 
 == 09/16/2014 ==
-demonstar55: Implement spell formula 137 (BER AA Desperation)
+mackal: Implement spell formula 137 (BER AA Desperation)
 Uleat (NateDog): Fix for LoadBuffs() crash when a spell with a non-persistent Illusion effect was loaded.
-demonstar55: Fix some effect calcs + implement more (derived from the client)
+mackal: Fix some effect calcs + implement more (derived from the client)
 
 == 09/15/2014 ==
 Kayen: Nimbus effects will now be reapplied after zoning and will be removed when associated buff fades.
 
 == 09/13/2014 ==
-demonstar55: Fix rogues not having Thieves' Cant
+mackal: Fix rogues not having Thieves' Cant
 
 == 09/09/2014 ==
-demonstar55: Incrase Mob kick/bash timer by 3
+mackal: Incrase Mob kick/bash timer by 3
 	see: http://www.eqemulator.org/forums/showthread.php?t=38734
-demonstar55: Fix slow effect on NPC special attack reuse timers
+mackal: Fix slow effect on NPC special attack reuse timers
 	see: http://www.eqemulator.org/forums/showthread.php?t=38734
-demonstar55: Slow fixes to bots!
-demonstar55: Revamped how NPC attack rate is set
+mackal: Slow fixes to bots!
+mackal: Revamped how NPC attack rate is set
 	SQL: 2014_09_09_attack_delay.sql
-demonstar55: Added attackdelay to #npcedit
+mackal: Added attackdelay to #npcedit
 
 == 09/08/2014 ==
-demonstar55: Fix slow calc
+mackal: Fix slow calc
 	see: http://www.eqemulator.org/forums/showthread.php?t=38734
 
 == 09/07/2014 ==
@@ -1202,18 +1296,18 @@ Uleat: Tweaked 'Smart' trading code to return main slots before sub slots in sta
 
 == 09/05/2014 ==
 Uleat: Fix for cursor item loss when zoning. (Thanks to the other devs who traced and fixed the 'macro' issue!)
-demonstar55: Fix size getting nuked with lua's SendIllusionPacket
+mackal: Fix size getting nuked with lua's SendIllusionPacket
 
 == 09/03/2014 ==
 Secrets: Identified the routines needed to augment items in RoF. Currently, only Insert and Remove are supported. Swap and Destroy do not work due to missing functions related to the cursor.
-demonstar55: Added work around command to show numhits on your buffs (#shownumhits)
+mackal: Added work around command to show numhits on your buffs (#shownumhits)
 Uleat: Fix for timer issue introduced by Zone::ShutDown() fix.
 
 == 09/02/2014 ==
 Secrets: Identified OP_GuildPromote for RoF clients.
 Secrets: Fixed promotion, demotion, transferring a leader and displaying of client ranks in the Rain of Fear client. The rain of fear client, as such, will only have 3 ranks like the other clients, but supports a theoretical 8 ranks later.
 Secrets/Akkadius: Fixed an issue involving character name lookup in the new DB code.
-demonstar55: crash fix checking DivineAura in hate_list.cpp
+mackal: crash fix checking DivineAura in hate_list.cpp
 Secrets: Reverted some code that got in the main branch that shouldn't have gotten there.
 Uleat: Changed #loc to report the same precision as /loc for Cartesians
 
@@ -1224,7 +1318,7 @@ KLS: Fixed a few quest related inconsistencies.
 KLS: Added Lua EntityList::ChannelMessage(from, type, msg, language)
 
 == 08/30/2014 ==
-demonstar55: (noudess) Merchants should be more descriptive of why they don't sell to you
+mackal: (noudess) Merchants should be more descriptive of why they don't sell to you
 
 == 08/26/2014 ==
 Uleat: Implemented 'Smart' Player Trade transfers. Trades are processed by containers, stackables and then all remaining. QueryServ logs have been updated to match these transactions.
@@ -1602,7 +1696,7 @@ Optional SQL: utils/sql/git/optional/2014_04_03_SpellProjectileRules.sql
 Note: The rules in this SQL are for setting the item id for the graphic used by the projectile on different clients.
 
 == 04/01/2014 ==
-demonstar55: Implemented ability for a merchant to open and close shop.
+mackal: Implemented ability for a merchant to open and close shop.
 	Lua quest functions: e.self:MerchantOpenShop() and e.self:MerchantCloseShop()
 	GM Commands: #merchant_open_shop (short: #open_shop) and #merchant_close_shop (short: #close_shop)
 		default to status 100, just in case you need to force the merchants status
@@ -1668,7 +1762,7 @@ Kayen: Revision to lull/harmony/pacification code to be consistent with live bas
 which if 'resisted' will cause the caster to gain aggro.
 
 == 03/05/2014 ==
-demonstar55: Corrected rogue's evade to be single target
+mackal: Corrected rogue's evade to be single target
 sorvani: fixed crash issue 119
 
 == 03/04/2014 ==
@@ -1683,7 +1777,7 @@ Kayen: Revision to root code to be consistent with live based on extensive perso
 Optional SQL: utils/sql/git/optional/2014_03_04_RootRule.sql
 
 == 03/03/2014 ==
-demonstar55: Implemented deadly strikes and gave rogues higher innate throwing crit chance
+mackal: Implemented deadly strikes and gave rogues higher innate throwing crit chance
 
 New rules: Combat:RogueCritThrowingChance, Combat:RogueDeadlyStrikeChance, Combat:RogueDeadlyStrikeMod
 	Defaults should give fairly close to live results
@@ -1695,7 +1789,7 @@ Kayen: Revision to charm code to be consistent with live based on extensive pers
 
 Optional SQL: utils/sql/git/optional/2014_03_02_CharmRules.sql
 
-demonstar55: Melee Crits, HoTs, DoTs messages should now be filtered correctly on all clients.
+mackal: Melee Crits, HoTs, DoTs messages should now be filtered correctly on all clients.
 	Clients that also support seeing others DoTs will now see them if they don't filter them
 	note: some newer clients have a 'mine only' option for HoTs but it functions the same as show
 
@@ -1747,7 +1841,7 @@ Sorvani: Renamed the instance_lockout and instance_lockout_player tables to inst
 Required SQL: utils/sql/git/2014_02_13_Rename_instance_lockout_tables.sql
 
 == 02/10/2014 ==
-demonstar55 (Secrets): Re-wrote the entity list to be a std::map. This should be used for direct entityID lookups and is noticably faster performance-wise. Also should result in less nil pointers potentially.
+mackal (Secrets): Re-wrote the entity list to be a std::map. This should be used for direct entityID lookups and is noticably faster performance-wise. Also should result in less nil pointers potentially.
 Secrets: Fixed a crash issue that could occur on #repop related to quest timers.
 Kayen: Divine Arbiration and other similar spell effects will now utilize a spell range check.
 Kayen: Revised how heal amount is calculated to properly incorporate all current focus effects/bonuses.
@@ -1778,14 +1872,14 @@ Kayen: Implemented SE_FfLimitUseType (focus limit to numhits type)
 
 == 01/20/2014 ==
 cavedude: Live-Like weather system (Thanks to robregen for figuring it out!)
-demonstar55: Implemented not_extendable spell flag
-demonstar55: Moved Spell Casting Reinforcement to DB
-demonstar55: Moved Mez Mastery to DB
+mackal: Implemented not_extendable spell flag
+mackal: Moved Spell Casting Reinforcement to DB
+mackal: Moved Mez Mastery to DB
 Kayen: Complete revision of the numhits systems to utilize 'numhits type' field in spell file.
 
 == 01/18/2014 ==
 sorvani: Implemented for Lua eq.get_characters_in_instance(uint16 instance_id), return a Lua HashTable
-demonstar55: NPCs will now cast their charms.
+mackal: NPCs will now cast their charms.
 
 == 01/13/2014 ==
 Kayen: Numerous minor fixes to spell effects.
@@ -1805,19 +1899,19 @@ Kayen: Implemented SE_LimitRace	(Limits to spells cast by a certain race)
 Kayen: Implemented SE_FcMute  (silences casting of spells that contain specific spell effects) ie silence only heals
 
 == 01/09/2014 ==
-demonstar55: Add pet size preservation like live (zone, camp, etc)
+mackal: Add pet size preservation like live (zone, camp, etc)
 
 == 01/07/2014 ==
-demonstar55: Moved pet can attack check to before it tries to attack, which is more live like.
+mackal: Moved pet can attack check to before it tries to attack, which is more live like.
 
 == 01/03/2014 ==
-demonstar55: Crash prevention for emote.
+mackal: Crash prevention for emote.
 
 == 01/02/2014 ==
-demonstar55: Stuns from beneficial spells (Harvest) ignore immunity
+mackal: Stuns from beneficial spells (Harvest) ignore immunity
 
 == 12/26/2013 ==
-demonstar55: Added classes_required to merchantlist (same bitmask as items)
+mackal: Added classes_required to merchantlist (same bitmask as items)
 
 == 12/24/2013 ==
 Secrets (Akkadius): Perl $client->SilentMessage("Message"); addition, this is a pre-req for a Perl plugin I've shared with EQEmu. This function essentially mimics a player speaking with an NPC - which is used in popup window responses
@@ -1838,14 +1932,14 @@ Kayen: Implemented SE_TriggerOnAmountValue (Trigger spell if HP/Mana/End bellow
 Kayen: Fix to SE_BlockNextSpellFocus to make it functional again.
 
 == 12/15/2013 ==
-demonstar55: Moved the blocked buff check down so we get spell effects like on live
+mackal: Moved the blocked buff check down so we get spell effects like on live
 Kayen: Implemented SE_ReduceHealing (Reduces amount of healing on target by X amount)
 Kayen: Implemented SE_CastonFocusEffect (Triggers spell as part of a focus, when that focus effect is used)
 Kayen: Implemented SE_IncreaseHitDmgTaken (Effect is triggered when X amount of damage is taken)
 Kayen: More fixes for various spell triggers/procs to now properly use their resist modifier.
 
 == 12/14/2013 ==
-demonstar55: Blocked buffs shouldn't fail, they should just not be applied.
+mackal: Blocked buffs shouldn't fail, they should just not be applied.
 JJ: Changed enable/disable recipe to confirm change made.
 
 == 12/13/2013 ==
@@ -1856,52 +1950,52 @@ Kayen: Fix for various spell triggers/procs to now properly use their resist mod
 Kayen: Fix to mob->ModSkillDmgTaken(skill_num, value), setting value to -1 will now properly effect all skills.
 
 == 12/11/2013 ==
-demonstar55: Fixed issue with crippling blow from berserker frenzy not actually doing anything
-demonstar55: Fix haste caps
+mackal: Fixed issue with crippling blow from berserker frenzy not actually doing anything
+mackal: Fix haste caps
 
 == 12/04/2013 ==
-demonstar55: Fixed SpellType_Charm case in AICastSpell
+mackal: Fixed SpellType_Charm case in AICastSpell
 
 == 12/03/2013 ==
-demonstar55: Added #showspellslist to view a mobs spell list
-demonstar55: Fix procing off of unattackable things
+mackal: Added #showspellslist to view a mobs spell list
+mackal: Fix procing off of unattackable things
 
 == 12/02/2013 ==
 JJ: Bandaid fix to CopyCharacter function.
 
 == 11/29/2013 ==
-demonstar55: Stacking issues should be resolved now, probably could be optimized more, but went from 3 loops that do stuff to 3 where only 2 really does stuff and one breaks early in most cases, so slightly better
+mackal: Stacking issues should be resolved now, probably could be optimized more, but went from 3 loops that do stuff to 3 where only 2 really does stuff and one breaks early in most cases, so slightly better
 
 == 11/23/2013 ==
 Secrets: Fixed an issue related to a zone crash where the count of the abilities in an AA was 0, leading to a size 0 buffer issue.
 
 == 11/19/2013 ==
 Secrets: Fixed an issue with two zone crashes reported on PEQ related to the buff restrictions code and AAs.
-demonstar55: Partially make use of dot_stacking_exempt (case when it's 1 is implemented, -1 case isn't)
+mackal: Partially make use of dot_stacking_exempt (case when it's 1 is implemented, -1 case isn't)
 
 == 11/18/2013 ==
-demonstar55: Added assistradius to npc_types, defaults to aggroradius if set to 0 (old behaviour)
+mackal: Added assistradius to npc_types, defaults to aggroradius if set to 0 (old behaviour)
 
 == 11/17/2013 ==
 Sorvani: fixed leash and tether special abilities to use the specified range correctly.
-demonstar55: Rewrote the Mob::_GetMovementSpeed fix an issue that arose from the change on 11/11
+mackal: Rewrote the Mob::_GetMovementSpeed fix an issue that arose from the change on 11/11
 	- Added the rule Character:BaseRunSpeedCap (default 158) so people can customize what their runspeed cap is. Hardcapped to 225 so stuff doesn't get too crazy.
 
 == 11/16/2013 ==
 Leere: Fixed the drinking message for auto-consume, it will again correctly show up for forced consumption instead.
-demonstar55: Added Mob::DoCastingChecks() which will check for various fail conditions while the casting bar is up. This is called after Mob::DoCastSpell() starts the casting and before it returns.
+mackal: Added Mob::DoCastingChecks() which will check for various fail conditions while the casting bar is up. This is called after Mob::DoCastSpell() starts the casting and before it returns.
 
 == 11/15/2013 ==
-demonstar55: Fixed Mob::CalcFocusEffect()'s SE_LimitEffect
+mackal: Fixed Mob::CalcFocusEffect()'s SE_LimitEffect
 Leere: Fixed a stacking issue for SE_StackingCommand_Block
 
 == 11/13/2013 ==
-demonstar55: Implemented bard song effect cap. You can set the base cap with the rule Character:BaseInstrumentSoftCap, defaults to 36 or "3.6" as it is sometimes referred to.
-demonstar55: Fix Echo of Taelosia and Ayonae's Tutelage to increase the mod cap instead of further improving the instrument mod
-demonstar55: Implemented Singing/Instrument Mastery as an AA bonus.
+mackal: Implemented bard song effect cap. You can set the base cap with the rule Character:BaseInstrumentSoftCap, defaults to 36 or "3.6" as it is sometimes referred to.
+mackal: Fix Echo of Taelosia and Ayonae's Tutelage to increase the mod cap instead of further improving the instrument mod
+mackal: Implemented Singing/Instrument Mastery as an AA bonus.
 
 == 11/11/2013 ==
-demonstar55: Changed the way walk speed is calculated to allow mobs to have their walk speed equal a 100% movement reduction
+mackal: Changed the way walk speed is calculated to allow mobs to have their walk speed equal a 100% movement reduction
 
 == 11/09/2013 ==
 Leere: Fixed Bard mana regen, they now only are affected by items and AA.
@@ -1951,50 +2045,50 @@ Uleat: Converted SkillType typedef enumeration to SkillUseTypes enumeration - So
 Uleat: Prepped the client patch files for larger skill buffer size (not active)
 
 == 10/24/2013 ==
-demonstar55: Fix some memory leaks in Mob::SpellOnTarget
+mackal: Fix some memory leaks in Mob::SpellOnTarget
 
 == 10/21/2013 ==
-demonstar55: Changed GetMinLevel return 0 for more cases that EQ uses for some reason ...
-demonstar55: Added buff level restrictions, set the Spells:BuffLevelRestrictions to false to have the old behavior.
+mackal: Changed GetMinLevel return 0 for more cases that EQ uses for some reason ...
+mackal: Added buff level restrictions, set the Spells:BuffLevelRestrictions to false to have the old behavior.
 
 == 10/18/2013 ==
 Uleat: Expanded the 'Bag Type' enumeration to include all known values. Also, set in place additional 'Bag Type' to 'Skill Type' conversions. Some of these will need to be verified before activation.
 Uleat: Cleaned up some unused enumerations to show a move towards standardization. More to come...
 
 == 10/12/2013 ==
-demonstar55: Allow Titanium and lower clients to enter Tutorial zone from character select
+mackal: Allow Titanium and lower clients to enter Tutorial zone from character select
 Bad_Captain: Fixed merc crash issue by updating special_abilities & vwMercNpcTypes (Sorvani).
 Bad_Captain: Bots- added out of combat bard songs & #bot bardoutofcombat on|off command to turn them on/off.
 
 == 10/11/2013 ==
-JJ: (demonstar55) Allow use of Go Home button when Tutorial still selected in RoF.
+JJ: (mackal) Allow use of Go Home button when Tutorial still selected in RoF.
 
 == 10/10/2013 ==
 Secrets: Fixed zone shutdown (or #reloadqst) reinitalization of Perl. This should allow for Perl 5.14 and later to work on Windows under the new quest system.
-demonstar55: Beneficial single target buffs shouldn't have their mana/timers set if they fail to cast after the Mob::SpellOnTarget call in Mob::SpellFinished
+mackal: Beneficial single target buffs shouldn't have their mana/timers set if they fail to cast after the Mob::SpellOnTarget call in Mob::SpellFinished
 JJ: Revert change to EnterWorldPacket introduced on 22 April 2013 to fix inability to enter Tutorial or Go Home from character select screen.
 
 == 10/09/2013 ==
-demonstar55: Fixed some more instances of the AA timer being eaten
+mackal: Fixed some more instances of the AA timer being eaten
 
 == 10/08/2013 ==
-demonstar55: Added IsBuffSpell(spell_id) that will return true if the spell has a duration, so would end up in effects/song/discs etc windows on the client
-demonstar55: Replaced instances of using CalcBuffDuration to determine if a spell was a buff with IsBuffSpell
-demonstar55: Removed Mob::HasBuffIcon since it was doing what IsBuffSpell does in a more convoluted way with a rather misleading name
-demonstar55: Fixed issues that arose from the 10/03/2013 change
+mackal: Added IsBuffSpell(spell_id) that will return true if the spell has a duration, so would end up in effects/song/discs etc windows on the client
+mackal: Replaced instances of using CalcBuffDuration to determine if a spell was a buff with IsBuffSpell
+mackal: Removed Mob::HasBuffIcon since it was doing what IsBuffSpell does in a more convoluted way with a rather misleading name
+mackal: Fixed issues that arose from the 10/03/2013 change
 
 == 10/05/2013 ==
 Sorvani: fixed issue with stackable items being created with 0 charges cause by fix to SummonItems
 
 == 10/03/2013 ==
-demonstar55: Fix when the random +1 tick is added to nerf extension focus effects to where they should be
+mackal: Fix when the random +1 tick is added to nerf extension focus effects to where they should be
 
 == 09/30/2013 ==
 Sorvani: Changed SummonItem to only summon an item with max charges when said default value is present and not on zero charges
-demonstar55: Fixed issue with #showstats showing your level for a bunch of values
+mackal: Fixed issue with #showstats showing your level for a bunch of values
 
 == 09/13/2013 ==
-demonstar55: Add support for /pet hold on and /pet hold off (UF and RoF)
+mackal: Add support for /pet hold on and /pet hold off (UF and RoF)
 
 == 08/29/2013 ==
 KLS: Removed Common Profiler and Zone Profiler.  They're well past outdated status and are just code bloat.
@@ -2140,8 +2234,8 @@ KLS: Perl now will (like lua) keep track of the values you return from EVENT_*.
 KLS: Exported eq.follow(entity_id, [distance]) and eq.stop_follow() to lua.
 
 == 07/01/2013 ==
-demonstar55: Fix Monster Summoning related to giants/cyclops
-demonstar55: Prevent Monster Summoning from summoning a portal in bothunder
+mackal: Fix Monster Summoning related to giants/cyclops
+mackal: Prevent Monster Summoning from summoning a portal in bothunder
 KLS: Merge of lua branch to master
 See: http://www.eqemulator.org/forums/showthread.php?t=37008 for more detailed information on what is added.
 Upgrade notes:
@@ -2209,35 +2303,35 @@ JJ: Fixed rare case where heals from buffs could go negative.
 Derision: Moved entity_list.Clear() prior to destruction of Perl objects in zone shutdown as I was seeing a segfault due to attempts to call EVENT_HATE_LIST as mobs were being destroyed.
 
 == 04/09/2013 ==
-demonstar55: Realized I was an idiot, changed salvage script to be better
+mackal: Realized I was an idiot, changed salvage script to be better
 optional SQL: 2013_04_09_SalvageCleanOld.sql - run if ran old script
 
 == 04/08/2013 ==
-demonstar55: Implemented Salvage AA
+mackal: Implemented Salvage AA
 required SQL: 2013_04_08_Salvage.sql
 script: generate_salvage.py - will generate the entries for some exceptions for salvage returns.
 
 == 04/04/2013 ==
-demonstar55: Implemented SE_ForageAdditionalItems as a bonus
+mackal: Implemented SE_ForageAdditionalItems as a bonus
 required SQL: 2013_04_04_NaturesBounty.sql
 
 == 04/03/2013 ==
-demonstar55: Overloaded Mob::Say_StringID with the option to provide a message type
-demonstar55: Switched rest of the Pet Messages to MT_PetResponse (Leader commands intentionally left the old way)
+mackal: Overloaded Mob::Say_StringID with the option to provide a message type
+mackal: Switched rest of the Pet Messages to MT_PetResponse (Leader commands intentionally left the old way)
 
 == 04/2/2013 ==
 Bad_Captain: Fixed Merc lack of use of heal over time spells (causing excessive healing).
 Bad_Captain: Fixed pet mitigation/AC issues.
 
 == 04/01/2013 ==
-demonstar55: AA reuse timers now start when you hit the button and are reset upon failure
-demonstar55: Instant Cast bard AAs can now be used while singing a song
+mackal: AA reuse timers now start when you hit the button and are reset upon failure
+mackal: Instant Cast bard AAs can now be used while singing a song
 
 == 03/30/2013 ==
-demonstar55: Fixed most of the pet talking, all use StringIDs now. Pet now informs you when it taunts.
+mackal: Fixed most of the pet talking, all use StringIDs now. Pet now informs you when it taunts.
 
 == 03/23/2013 ==
-demonstar55: Fix issues with escape not always working and fixed SE_FadingMemories to have the message since the message isn't part of the spell data.
+mackal: Fix issues with escape not always working and fixed SE_FadingMemories to have the message since the message isn't part of the spell data.
     Escape now uses just the spell and not the AA Actoin
     Fading Memories now only uses the AA Action to eat mana
 
@@ -2247,7 +2341,7 @@ Bad_Captain: Added checks before dismissing merc to prevent possible bugged merc
 Bad_Captain: Merged in Secret's merc memory leak fixes.
 
 == 03/20/2013 ==
-demonstar55: Fixed stacking issues with SE_Limit* (ex. Unholy Aura Discipline and Aura of Reverence)
+mackal: Fixed stacking issues with SE_Limit* (ex. Unholy Aura Discipline and Aura of Reverence)
 
 == 03/18/2013 ==
 Bad_Captain: Fixed zone crash due to merc focus effects & tribute.
@@ -2310,7 +2404,7 @@ KLS: Changed how shared memory works:
 af4t: Add Touch of the Wicked AA redux to SK Improved Harm Touch and Leech Touch.
 
 == 02/22/2013 ==
-demonstar55: Mobs will now be removed from XTargets when they get back to their way point, should be last instance of XTarget mobs not clearing when they are not aggroed anymore
+mackal: Mobs will now be removed from XTargets when they get back to their way point, should be last instance of XTarget mobs not clearing when they are not aggroed anymore
 
 == 02/19/2013 ==
 Derision: World should no longer crash if the start_zone query fails at character creation.
@@ -2319,7 +2413,7 @@ Derision: World should no longer crash if the start_zone query fails at characte
 Bad_Captain: Moved merc save to merc table, save merc buffs, added cure and rez spells to healer merc.
 JJ: Chat garbled for drunk characters.
 Derision: Charmed pets should no longer be targettable with F8. Charmed pets no longer get a surname of Soandso's Pet.
-demonstar55: Added potionbelt tool tip
+mackal: Added potionbelt tool tip
 KLS: Added EVENT_DEATH to Player Quests
 
 REQUIRED SQL: 2013_02_18_Merc_Rules_and_Tables.sql
@@ -2331,8 +2425,8 @@ Derision: Client version is now returned by the stream proxy as a number.
 Derision: Fixed bug where BecomeTrader packets were only being sent to the Trader, not all other clients in the bazaar.
 
 == 02/16/2013 ==
-demonstar55: Fix AA reuse timer calc
-demonstar55: Remove old filters and change all remaining old to new (Also fix Auction filtering out OOC as well due to incorrect define)
+mackal: Fix AA reuse timer calc
+mackal: Remove old filters and change all remaining old to new (Also fix Auction filtering out OOC as well due to incorrect define)
 
 == 02/12/2013 ==
 Kayen: AA fix
@@ -2343,7 +2437,7 @@ REQUIRED SQL: utils/sql/svn/2504_required_aa_updates.sql
 Derision: RoF: Added ENCODE for OP_BeginCast (fixes no sound during spell casting). Corrected OP_DeleteSpell.
 
 == 02/10/2013 ==
-JJ: (demonstar55) Language skill up should use proper function.
+JJ: (mackal) Language skill up should use proper function.
 JJ: SetLanguageSkill now updates client immediately. Both functions do proper limit checks.
     Added two missing languages. Skill level 0 in a spoken language now shows 'in an unknown tongue'.
 JJ: Initial implementation of a GarbleMessage function and implemented for languages. Can be shared with drunk speaking.
@@ -2379,7 +2473,7 @@ Trevius: RoF: Turning on Trader mode in bazaar now works, but no further trader
 Akkadius: Fixed an issue where global_npc.pl was not initializing (initially)
 
 == 01/31/2013 ==
-cavedude00: (demonstar55) Rune aggro fix
+cavedude00: (mackal) Rune aggro fix
 cavedude00: (Drajor) Tradeskill skillneeded fix.
 
 == 01/30/2013 ==
@@ -2413,7 +2507,7 @@ Bad_Captain: Mercs - Initial spell casting AI committed.
 KLS: Added crash logging for Windows builds.
 Trevius: Mercenaries now despawn when a player camps out or disconnects in any way.
 Trevius: Players with a Mercenary spawned can now be invited to and join another group with their mercenary.
-Sorvani: (Demonstar55): Moved stunproc rule implmentation to catch all cases
+Sorvani: (mackal): Moved stunproc rule implmentation to catch all cases
 
 OPTIONAL SQL: utils/sql/svn/mercs.sql		-- rerun for updated merc stats & merc spell lists
 
@@ -2864,9 +2958,9 @@ references:
 	http://www.eqemulator.org/forums/showthread.php?t=35629 - CSD Bugged Corpse Patch
 	http://www.eqemulator.org/forums/showthread.php?t=35699 - CSD Bandolier Patch
 
-cavedude: (demonstar55) Damage shields by default will no longer count towards EXP gain. (Rule also added to change this behaviour.)
-cavedude: (demonstar55) Extended targets should now clear when aggro is lost using skills.
-cavedude: (demonstar55) AAs with shorter reuse timers should now reset if the cast failed (interrupted.)
+cavedude: (mackal) Damage shields by default will no longer count towards EXP gain. (Rule also added to change this behaviour.)
+cavedude: (mackal) Extended targets should now clear when aggro is lost using skills.
+cavedude: (mackal) AAs with shorter reuse timers should now reset if the cast failed (interrupted.)
 KLS: Fixed a cause of raids disbanding on zoning.
 
 OPTIONAL SQL: INSERT INTO `rule_values` VALUES (1, 'Combat:EXPFromDmgShield', 'false', 'Determine if damage from a damage shield counts for EXP gain.');
@@ -3243,7 +3337,7 @@ Kayen: Implemented Perl Mob Quest Object GetModVulnerability(resist type) - Retu
 Optional SQL: utils/sql/svn/2154_optional_rule_spell_procs_resists_falloff.sql
 
 ==06/22/2012==
-Secrets: (demonstar55) Spells now display to all clients and can be filtered as such.
+Secrets: (mackal) Spells now display to all clients and can be filtered as such.
 Secrets: Damage Shields now go to the proper filter, and do not show the non-melee damage to everyone.
 
 ==06/03/2012==
@@ -5398,10 +5492,10 @@ WildcardX: *BOTS* Bots can now be invited and disbanded from your group by simpl
 WildcardX: *BOTS* Tweak to the bots total play time calculation to make it more accurate.
 KLS: Added #path meshtest simple to do a faster search on errant path nodes.
 KLS: Modified the accurate hazard code to make automatic path maps with more accurate info that requires less manual editing afterward.
-cavedude: (demonstar55) Pets will now be amiable to their owners, indifferent to all else.
-cavedude: (demonstar55) Added $client->KeyRingCheck() and $client->KeyRingAdd() to allow Perl to manipulate the keyring.
-cavedude: (demonstar55) Casting an invis spell on a player that already has a similar type invis spell will no longer drop the existing buff.
-cavedude: (demonstar55) Corrected message string for heal spells.
+cavedude: (mackal) Pets will now be amiable to their owners, indifferent to all else.
+cavedude: (mackal) Added $client->KeyRingCheck() and $client->KeyRingAdd() to allow Perl to manipulate the keyring.
+cavedude: (mackal) Casting an invis spell on a player that already has a similar type invis spell will no longer drop the existing buff.
+cavedude: (mackal) Corrected message string for heal spells.
 cavedude: Added rule to determine at what HP a fleeing NPC will halt due to being snared.
 
 ==08/07/2009==
@@ -6037,7 +6131,7 @@ KLS: Fixed the /bug structure and updated the table to be more useful.
 Required SQL: .\utils\sql\svn\503_bugs.sql
 
 ==05/11/2009==
-demonstar55: Added a function to allow Perl to check augments within items.
+mackal: Added a function to allow Perl to check augments within items.
 cavedude: Increased bind wound skill up speed some.
 KLS: Fix for potentially dangerous typo in spawn conditions code.
 KLS: Removed some non-functioning but still taking up database resources database code.
@@ -6338,7 +6432,7 @@ cavedude: Removed the USE_RACE_CLASS_XP_MODS define as it was outdated and horri
 cavedude: Added group XP bonus. The larger the group, the higher the XP gain.
 cavedude: Added XP bonus for Warrior, Rogue, and Halfling.
 cavedude: Corrected ZEM for AAs.
-cavedude: (Thanks to demonstar55) Pet Affinity will no longer effect charmed pets.
+cavedude: (Thanks to mackal) Pet Affinity will no longer effect charmed pets.
 cavedude: (realityincarnate) Bard songs that require instruments will now require them.
 
 Please note: XP gain has pretty much been overhauled. You may need tweak the multiplier rules for your server.
@@ -6472,7 +6566,7 @@ AndMetal: Augments are now visible when linking items.
 Trevius: SoF - Adjusted the new Item Structure to align more fields
 Trevius: SoF - Added OP_Consume and OP_LootRequest opcodes
 cavedude00: (AndMetal) AAs now use skill_id instead of index for prereqs.
-cavedude00: (demonstar55) Implemented Improved Instrument Mastery, Improved Singing Mastery, and Echo of Taelosia AAs.
+cavedude00: (mackal) Implemented Improved Instrument Mastery, Improved Singing Mastery, and Echo of Taelosia AAs.
 cavedude00: Created Combat:ChanceToHitDivideBy rule and increased default value to 1250.
 	Required and Optional SQL: utils/sql/svn/326_aas.sql
 KLS: SoF - Fix for item slots in bags.

common/CMakeLists.txt

@@ -72,9 +72,7 @@ SET(common_sources
 	timeoutmgr.cpp
 	timer.cpp
 	unix.cpp
-	uuid.cpp
 	worldconn.cpp
-	web_interface_utils.cpp
 	xml_parser.cpp
 	platform.cpp
 	patches/patches.cpp
@@ -207,11 +205,9 @@ SET(common_headers
 	timer.h
 	types.h
 	unix.h
-	uuid.h
 	useperl.h
 	version.h
 	worldconn.h
-	web_interface_utils.h
 	xml_parser.h
 	zone_numbers.h
 	patches/patches.h

common/database.cpp

@@ -2136,3 +2136,27 @@ bool Database::SaveTime(int8 minute, int8 hour, int8 day, int8 month, int16 year
 	return results.Success();
 
 }
+
+int Database::GetIPExemption(std::string account_ip) {
+	std::string query = StringFormat("SELECT `exemption_amount` FROM `ip_exemptions` WHERE `exemption_ip` = '%s'", account_ip.c_str());
+	auto results = QueryDatabase(query);
+	
+	if (results.Success() && results.RowCount() > 0) {
+		auto row = results.begin();
+		return atoi(row[0]);
+	}
+	
+	return RuleI(World, MaxClientsPerIP);
+}
+
+int Database::GetInstanceID(uint32 char_id, uint32 zone_id) {
+	std::string query = StringFormat("SELECT instance_list.id FROM instance_list INNER JOIN instance_list_player ON instance_list.id = instance_list_player.id WHERE instance_list.zone = '%i' AND instance_list_player.charid = '%i'", zone_id, char_id);
+	auto results = QueryDatabase(query);
+
+	if (results.Success() && results.RowCount() > 0) {
+		auto row = results.begin();
+		return atoi(row[0]);;
+	}
+
+	return 0;
+}

common/database.h

@@ -186,6 +186,10 @@ public:
 
 	void	GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus);
 	void	SetAgreementFlag(uint32 acctid);
+	
+	int		GetIPExemption(std::string account_ip);
+
+	int		GetInstanceID(uint32 char_id, uint32 zone_id);
 
 
 	/* Groups */

common/database_conversions.cpp

@@ -472,31 +472,18 @@ bool Database::CheckDatabaseConversions() {
 	CheckDatabaseConvertPPDeblob();
 	CheckDatabaseConvertCorpseDeblob();
 
-	/* Fetch Automatic Upgrade Script */
-	if (!std::ifstream("eqemu_update.pl")){
+	/* Fetch EQEmu Server script */
+	if (!std::ifstream("eqemu_server.pl")){
 		std::cout << "Pulling down automatic database upgrade script..." << std::endl;
 #ifdef _WIN32
-		system("perl -MLWP::UserAgent -e \"require LWP::UserAgent;  my $ua = LWP::UserAgent->new; $ua->timeout(10); $ua->env_proxy; my $response = $ua->get('https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_update.pl'); if ($response->is_success){ open(FILE, '> eqemu_update.pl'); print FILE $response->decoded_content; close(FILE); }\"");
+		system("perl -MLWP::UserAgent -e \"require LWP::UserAgent;  my $ua = LWP::UserAgent->new; $ua->timeout(10); $ua->env_proxy; my $response = $ua->get('https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl'); if ($response->is_success){ open(FILE, '> eqemu_server.pl'); print FILE $response->decoded_content; close(FILE); }\"");
 #else
-		system("wget --no-check-certificate -O eqemu_update.pl https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_update.pl");
+		system("wget --no-check-certificate -O eqemu_server.pl https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl");
 #endif
 	}
 
-	/*
-		Automatic (Database) Upgrade Script
-		Script: eqemu_update.pl V 1 - the number that world passes to the script will
-		force the script to check for a newer version to update itself with
-		eqemu_update.pl ran_from_world - won't bring up a menu if your database versions match
-		eqemu_update.pl - ran standalone will bring up a menu prompt
-	*/
-
-	/* Check for a new version of this script, the arg passed
-	would have to be higher than the copy they have downloaded
-	locally and they will re fetch */
-	system("perl eqemu_update.pl V 14"); 
-
-	/* Run Automatic Database Upgrade Script */
-	system("perl eqemu_update.pl ran_from_world");
+	/* Run EQEmu Server script (Checks for database updates) */
+	system("perl eqemu_server.pl ran_from_world");
 
 	return true;
 }

common/emu_tcp_connection.cpp

@@ -363,22 +363,6 @@ bool EmuTCPConnection::LineOutQueuePush(char* line) {
 			safe_delete_array(line);
 			return(true);
 		}
-		if (strcmp(line, "**PACKETMODEWI**") == 0) {
-			MSendQueue.lock();
-			safe_delete_array(sendbuf);
-			if (TCPMode == modeConsole)
-				Send((const uchar*) "\0**PACKETMODEWI**\r", 18);
-			TCPMode = modePacket;
-			PacketMode = packetModeWebInterface;
-			EmuTCPNetPacket_Struct* tnps = 0;
-			while ((tnps = InModeQueue.pop())) {
-				SendPacket(tnps);
-				safe_delete_array(tnps);
-			}
-			MSendQueue.unlock();
-			safe_delete_array(line);
-			return(true);
-		}
 	}
 
 	return(TCPConnection::LineOutQueuePush(line));
@@ -432,13 +416,6 @@ bool EmuTCPConnection::ConnectIP(uint32 irIP, uint16 irPort, char* errbuf) {
 				sendbuf = new uchar[sendbuf_size];
 				memcpy(sendbuf, "\0**PACKETMODEQS**\r", sendbuf_size);
 			} 
-			else if (PacketMode == packetModeWebInterface) {
-				safe_delete_array(sendbuf);
-				sendbuf_size = 18;
-				sendbuf_used = sendbuf_size;
-				sendbuf = new uchar[sendbuf_size];
-				memcpy(sendbuf, "\0**PACKETMODEWI**\r", sendbuf_size);
-			}
 			else {
 				//default: packetModeZone
 				safe_delete_array(sendbuf);

common/emu_tcp_connection.h

@@ -31,7 +31,7 @@ class ServerPacket;
 class EmuTCPConnection : public TCPConnection {
 public:
 	enum eTCPMode { modeConsole, modeTransition, modePacket };
-	enum ePacketMode { packetModeZone, packetModeLauncher, packetModeLogin, packetModeUCS, packetModeQueryServ, packetModeWebInterface };
+	enum ePacketMode { packetModeZone, packetModeLauncher, packetModeLogin, packetModeUCS, packetModeQueryServ };
 
 	EmuTCPConnection(uint32 ID, EmuTCPServer* iServer, SOCKET iSock, uint32 irIP, uint16 irPort, bool iOldFormat = false);
 	EmuTCPConnection(bool iOldFormat = false, EmuTCPServer* iRelayServer = 0, eTCPMode iMode = modePacket);	// for outgoing connections

common/eq_packet_structs.h

@@ -1934,8 +1934,7 @@ struct Merchant_Sell_Struct {
 /*004*/	uint32	playerid;		// Player's entity id
 /*008*/	uint32	itemslot;
 		uint32	unknown12;
-/*016*/	uint8	quantity;		// Already sold
-/*017*/ uint8	Unknown016[3];
+/*016*/	uint32	quantity;
 /*020*/ uint32	price;
 };
 struct Merchant_Purchase_Struct {
@@ -2509,23 +2508,25 @@ struct BookRequest_Struct {
 */
 struct Object_Struct {
 /*00*/	uint32	linked_list_addr[2];// They are, get this, prev and next, ala linked list
-/*08*/	uint16	size;				//
+/*08*/	float	size;				//
 /*10*/	uint16	solidtype;			//
 /*12*/	uint32	drop_id;			// Unique object id for zone
 /*16*/	uint16	zone_id;			// Redudant, but: Zone the object appears in
 /*18*/	uint16	zone_instance;		//
 /*20*/	uint32	unknown020;			//
 /*24*/	uint32	unknown024;			//
-/*28*/	float	heading;			// heading
-/*32*/	float	z;					// z coord
-/*36*/	float	x;					// x coord
-/*40*/	float	y;					// y coord
-/*44*/	char	object_name[32];	// Name of object, usually something like IT63_ACTORDEF
-/*76*/	uint32	unknown076;			//
-/*80*/	uint32	object_type;		// Type of object, not directly translated to OP_OpenObject
-/*84*/	uint32	unknown084;			//set to 0xFF
-/*88*/	uint32	spawn_id;			// Spawn Id of client interacting with object
-/*92*/
+/*28*/	float	tilt_x;
+/*32*/	float	tilt_y;
+/*36*/	float	heading;			// heading
+/*40*/	float	z;					// z coord
+/*44*/	float	x;					// x coord
+/*76*/	float	y;					// y coord
+/*80*/	char	object_name[32];	// Name of object, usually something like IT63_ACTORDEF
+/*84*/	uint32	unknown076;			//
+/*88*/	uint32	object_type;		// Type of object, not directly translated to OP_OpenObject
+/*92*/	uint32	unknown084;			//set to 0xFF
+		uint32	spawn_id;			// Spawn Id of client interacting with object
+
 };
 // 01 = generic drop, 02 = armor, 19 = weapon
 //[13:40] and 0xff seems to be indicative of the tradeskill/openable items that end up returning the old style item type in the OP_OpenObject

common/eq_stream.h

@@ -241,7 +241,7 @@ class EQStream : public EQStreamInterface {
 		virtual bool CheckState(EQStreamState state) { return GetState() == state; }
 		virtual std::string Describe() const { return("Direct EQStream"); }
 
-		void SetOpcodeManager(OpcodeManager **opm) { OpMgr = opm; }
+		virtual void SetOpcodeManager(OpcodeManager **opm) { OpMgr = opm; }
 
 		void CheckTimeout(uint32 now, uint32 timeout=30);
 		bool HasOutgoingData();
@@ -250,13 +250,13 @@ class EQStream : public EQStreamInterface {
 		void Write(int eq_fd);
 
 		// whether or not the stream has been assigned (we passed our stream match)
-		void SetActive(bool val) { streamactive = val; }
+		virtual void SetActive(bool val) { streamactive = val; }
 
 		//
 		inline bool IsInUse() { bool flag; MInUse.lock(); flag=(active_users>0); MInUse.unlock(); return flag; }
 		inline void PutInUse() { MInUse.lock(); active_users++; MInUse.unlock(); }
 
-		inline EQStreamState GetState() { EQStreamState s; MState.lock(); s=State; MState.unlock(); return s; }
+		virtual EQStreamState GetState() { EQStreamState s; MState.lock(); s=State; MState.unlock(); return s; }
 
 		static SeqOrder CompareSequence(uint16 expected_seq , uint16 seq);
 
@@ -306,19 +306,7 @@ class EQStream : public EQStreamInterface {
 		const uint64 GetPacketsReceived() { return received_packet_count; }
 
 		//used for dynamic stream identification
-		class Signature {
-		public:
-			//this object could get more complicated if needed...
-			uint16 ignore_eq_opcode;		//0=dont ignore
-			uint16 first_eq_opcode;
-			uint32 first_length;			//0=dont check length
-		};
-		typedef enum {
-			MatchNotReady,
-			MatchSuccessful,
-			MatchFailed
-		} MatchState;
-		MatchState CheckSignature(const Signature *sig);
+		virtual MatchState CheckSignature(const Signature *sig);
 
 };
 

common/eq_stream_ident.cpp

@@ -26,7 +26,7 @@ EQStreamIdentifier::~EQStreamIdentifier() {
 	}
 }
 
-void EQStreamIdentifier::RegisterPatch(const EQStream::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs) {
+void EQStreamIdentifier::RegisterPatch(const EQStreamInterface::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs) {
 	auto p = new Patch;
 	p->signature = sig;
 	p->name = name;
@@ -144,7 +144,7 @@ void EQStreamIdentifier::Process() {
 	}	//end foreach stream
 }
 
-void EQStreamIdentifier::AddStream(std::shared_ptr<EQStream> &eqs) {
+void EQStreamIdentifier::AddStream(std::shared_ptr<EQStreamInterface> &eqs) {
 	m_streams.push_back(Record(eqs));
 	eqs = nullptr;
 }
@@ -157,7 +157,7 @@ EQStreamInterface *EQStreamIdentifier::PopIdentified() {
 	return(res);
 }
 
-EQStreamIdentifier::Record::Record(std::shared_ptr<EQStream> s)
+EQStreamIdentifier::Record::Record(std::shared_ptr<EQStreamInterface> s)
 :	stream(std::move(s)),
 	expire(STREAM_IDENT_WAIT_MS)
 {

common/eq_stream_ident.h

@@ -18,11 +18,11 @@ public:
 	~EQStreamIdentifier();
 
 	//registration interface.
-	void RegisterPatch(const EQStream::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs);
+	void RegisterPatch(const EQStreamInterface::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs);
 
 	//main processing interface
 	void Process();
-	void AddStream(std::shared_ptr<EQStream> &eqs);
+	void AddStream(std::shared_ptr<EQStreamInterface> &eqs);
 	EQStreamInterface *PopIdentified();
 
 protected:
@@ -31,7 +31,7 @@ protected:
 	class Patch {
 	public:
 		std::string				name;
-		EQStream::Signature		signature;
+		EQStreamInterface::Signature		signature;
 		OpcodeManager **		opcodes;
 		const StructStrategy *structs;
 	};
@@ -40,8 +40,8 @@ protected:
 	//pending streams..
 	class Record {
 	public:
-		Record(std::shared_ptr<EQStream> s);
-		std::shared_ptr<EQStream> stream;		//we own this
+		Record(std::shared_ptr<EQStreamInterface> s);
+		std::shared_ptr<EQStreamInterface> stream;		//we own this
 		Timer expire;
 	};
 	std::vector<Record> m_streams;	//we own these objects, and the streams contained in them.

common/eq_stream_intf.h

@@ -15,11 +15,25 @@ typedef enum {
 } EQStreamState;
 
 class EQApplicationPacket;
+class OpcodeManager;
 
 class EQStreamInterface {
 public:
 	virtual ~EQStreamInterface() {}
 
+	class Signature {
+	public:
+		//this object could get more complicated if needed...
+		uint16 ignore_eq_opcode;		//0=dont ignore
+		uint16 first_eq_opcode;
+		uint32 first_length;			//0=dont check length
+	};
+	typedef enum {
+		MatchNotReady,
+		MatchSuccessful,
+		MatchFailed
+	} MatchState;
+
 	virtual void QueuePacket(const EQApplicationPacket *p, bool ack_req=true) = 0;
 	virtual void FastQueuePacket(EQApplicationPacket **p, bool ack_req=true) = 0;
 	virtual EQApplicationPacket *PopPacket() = 0;
@@ -30,6 +44,10 @@ public:
 	virtual uint16 GetRemotePort() const = 0;
 	virtual bool CheckState(EQStreamState state) = 0;
 	virtual std::string Describe() const = 0;
+	virtual void SetActive(bool val) { }
+	virtual MatchState CheckSignature(const Signature *sig) { return MatchFailed; }
+	virtual EQStreamState GetState() = 0;
+	virtual void SetOpcodeManager(OpcodeManager **opm) = 0;
 
 	virtual const uint32 GetBytesSent() const { return 0; }
 	virtual const uint32 GetBytesRecieved() const { return 0; }

common/eq_stream_proxy.cpp

@@ -5,7 +5,7 @@
 #include "struct_strategy.h"
 
 
-EQStreamProxy::EQStreamProxy(std::shared_ptr<EQStream> &stream, const StructStrategy *structs, OpcodeManager **opcodes)
+EQStreamProxy::EQStreamProxy(std::shared_ptr<EQStreamInterface> &stream, const StructStrategy *structs, OpcodeManager **opcodes)
 :	m_stream(stream),
 	m_structs(structs),
 	m_opcodes(opcodes)
@@ -26,6 +26,16 @@ const EQEmu::versions::ClientVersion EQStreamProxy::ClientVersion() const
 	return m_structs->ClientVersion();
 }
 
+EQStreamState EQStreamProxy::GetState()
+{
+	return m_stream->GetState();
+}
+
+void EQStreamProxy::SetOpcodeManager(OpcodeManager **opm)
+{
+	return m_stream->SetOpcodeManager(opm);
+}
+
 void EQStreamProxy::QueuePacket(const EQApplicationPacket *p, bool ack_req) {
 	if(p == nullptr)
 		return;

common/eq_stream_proxy.h

@@ -14,7 +14,7 @@ class EQApplicationPacket;
 class EQStreamProxy : public EQStreamInterface {
 public:
 	//takes ownership of the stream.
-	EQStreamProxy(std::shared_ptr<EQStream> &stream, const StructStrategy *structs, OpcodeManager **opcodes);
+	EQStreamProxy(std::shared_ptr<EQStreamInterface> &stream, const StructStrategy *structs, OpcodeManager **opcodes);
 	virtual ~EQStreamProxy();
 
 	//EQStreamInterface:
@@ -29,6 +29,8 @@ public:
 	virtual bool CheckState(EQStreamState state);
 	virtual std::string Describe() const;
 	virtual const EQEmu::versions::ClientVersion ClientVersion() const;
+	virtual EQStreamState GetState();
+	virtual void SetOpcodeManager(OpcodeManager **opm);
 
 	virtual const uint32 GetBytesSent() const;
 	virtual const uint32 GetBytesRecieved() const;
@@ -36,8 +38,8 @@ public:
 	virtual const uint32 GetBytesRecvPerSecond() const;
 
 protected:
-	std::shared_ptr<EQStream> const					m_stream;	//we own this stream object.
-	const StructStrategy *const		m_structs;	//we do not own this object.
+	std::shared_ptr<EQStreamInterface> const m_stream;	//we own this stream object.
+	const StructStrategy *const	m_structs;	//we do not own this object.
 	//this is a pointer to a pointer to make it less likely that a packet will
 	//reference an invalid opcode manager when they are being reloaded.
 	OpcodeManager **const			m_opcodes;	//we do not own this object.

common/eqemu_config.cpp

@@ -29,7 +29,7 @@ EQEmuConfig *EQEmuConfig::_config = nullptr;
 void EQEmuConfig::do_world(TiXmlElement *ele)
 {
 	const char *text;
-	TiXmlElement * sub_ele;
+	TiXmlElement * sub_ele;;
 	text = ParseTextBlock(ele, "shortname");
 	if (text) {
 		ShortName = text;
@@ -220,29 +220,6 @@ void EQEmuConfig::do_qsdatabase(TiXmlElement *ele)
 	}
 }
 
-
-void EQEmuConfig::do_web_interface(TiXmlElement *ele) {
-	const char *text;
-
-	text = ParseTextBlock(ele, "port", true);
-	if (text)
-		WebInterfacePort = atoi(text);
-
-	text = ParseTextBlock(ele, "cert", true);
-	if (text)
-		WebInterfaceCert = text;
-
-	text = ParseTextBlock(ele, "priv_key", true);
-	if (text)
-		WebInterfacePrivKey = text;
-
-	TiXmlElement *sub_ele = ele->FirstChildElement("ssl");
-	if (sub_ele != nullptr) {
-		WebInterfaceUseSSL = true;
-	}
-}
-
-
 void EQEmuConfig::do_zones(TiXmlElement *ele)
 {
 	const char *text;
@@ -509,8 +486,6 @@ std::string EQEmuConfig::GetByName(const std::string &var_name) const
 	return ("");
 }
 
-
-
 void EQEmuConfig::Dump() const
 {
 	std::cout << "ShortName = " << ShortName << std::endl;
@@ -541,10 +516,6 @@ void EQEmuConfig::Dump() const
 	std::cout << "QSDatabasePassword = " << QSDatabasePassword << std::endl;
 	std::cout << "QSDatabaseDB = " << QSDatabaseDB << std::endl;
 	std::cout << "QSDatabasePort = " << QSDatabasePort << std::endl;
-	std::cout << "WebInterfacePort = " << WebInterfacePort << std::endl;
-	std::cout << "WebInterfaceUseSSL = " << WebInterfaceUseSSL << std::endl;
-	std::cout << "WebInterfaceCert = " << WebInterfaceCert << std::endl;
-	std::cout << "WebInterfacePrivKey = " << WebInterfacePrivKey << std::endl;
 	std::cout << "SpellsFile = " << SpellsFile << std::endl;
 	std::cout << "OpCodesFile = " << OpCodesFile << std::endl;
 	std::cout << "PluginPlFile = " << PluginPlFile << std::endl;
@@ -558,5 +529,6 @@ void EQEmuConfig::Dump() const
 	std::cout << "ZonePortLow = " << ZonePortLow << std::endl;
 	std::cout << "ZonePortHigh = " << ZonePortHigh << std::endl;
 	std::cout << "DefaultStatus = " << (int)DefaultStatus << std::endl;
+//	std::cout << "DynamicCount = " << DynamicCount << std::endl;
 }
 

common/eqemu_config.h

@@ -76,12 +76,6 @@ class EQEmuConfig : public XMLParser
 		std::string QSDatabaseDB;
 		uint16 QSDatabasePort;
 
-		// from <web_interface>
-		uint16 WebInterfacePort;
-		bool WebInterfaceUseSSL;
-		std::string WebInterfaceCert;
-		std::string WebInterfacePrivKey;
-
 		// From <files/>
 		std::string SpellsFile;
 		std::string OpCodesFile;
@@ -226,7 +220,7 @@ class EQEmuConfig : public XMLParser
 			return _config->ParseFile(EQEmuConfig::ConfigFile.c_str(), "server");
 		}
 
-	void Dump() const;
+		void Dump() const;
 };
 
 #endif

common/eqemu_config_elements.h

@@ -4,7 +4,6 @@ ELEMENT(mailserver)
 ELEMENT(zones)
 ELEMENT(database)
 ELEMENT(qsdatabase)
-ELEMENT(web_interface)
 ELEMENT(files)
 ELEMENT(directories)
 ELEMENT(launcher)

common/eqemu_logsys.h

@@ -83,6 +83,7 @@ namespace Logs {
 		Server_Client_Packet_With_Dump,
 		Client_Server_Packet_With_Dump,
 		Login_Server,
+		Client_Login,
 		MaxCategoryID	/* Don't Remove this*/
 	};
 
@@ -131,7 +132,8 @@ namespace Logs {
 		"Packet :: Client -> Server Unhandled",
 		"Packet :: Server -> Client (Dump)",
 		"Packet :: Client -> Server (Dump)",
-		"Login Server"
+		"Login Server",
+		"Client Login"
 	};
 }
 

common/patches/rof.cpp

@@ -87,7 +87,7 @@ namespace RoF
 
 		//ok, now we have what we need to register.
 
-		EQStream::Signature signature;
+		EQStreamInterface::Signature signature;
 		std::string pname;
 
 		//register our world signature.
@@ -477,10 +477,11 @@ namespace RoF
 		for (uint16 i = 0; i < emu->count; ++i)
 		{
 			uint16 buffslot = emu->entries[i].buff_slot;
-			// Not sure if this is needs amending for RoF yet.
-			if (emu->entries[i].buff_slot >= 25)
-			{
-				buffslot += 17;
+			if (emu->type == 0) { // only correct for self packets
+				if (emu->entries[i].buff_slot >= 25)
+					buffslot += 17;
+				if (buffslot == 54)
+					buffslot = 62;
 			}
 
 			__packet->WriteUInt32(buffslot);
@@ -986,8 +987,8 @@ namespace RoF
 		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->drop_id);	// Some unique id
 		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, 0);	// Same for all objects in the zone
 		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->heading);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0);	// X tilt
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0);	// Y tilt
+		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->tilt_x);	// X tilt
+		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->tilt_y);	// Y tilt
 		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->size != 0 && (float)emu->size < 5000.f ? (float)((float)emu->size / 100.0f) : 1.f );	// This appears to be the size field. Hackish logic because some PEQ DB items were corrupt.
 		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->y);
 		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->x);

common/patches/rof2.cpp

@@ -87,7 +87,7 @@ namespace RoF2
 
 		//ok, now we have what we need to register.
 
-		EQStream::Signature signature;
+		EQStreamInterface::Signature signature;
 		std::string pname;
 
 		//register our world signature.
@@ -549,16 +549,15 @@ namespace RoF2
 		for (uint16 i = 0; i < emu->count; ++i)
 		{
 			uint16 buffslot = emu->entries[i].buff_slot;
-			// Not sure if this is needs amending for RoF2 yet.
-			if (emu->entries[i].buff_slot >= 25)
-			{
-				buffslot += 17;
+			if (emu->type == 0) { // only correct for self packets
+				if (emu->entries[i].buff_slot >= 25)
+					buffslot += 17;
+				// TODO: We should really just deal with these "server side"
+				// so we can have clients not limited to other clients.
+				// This fixes discs, songs were changed to 20
+				if (buffslot == 54)
+					buffslot = 62;
 			}
-			// TODO: We should really just deal with these "server side"
-			// so we can have clients not limited to other clients.
-			// This fixes discs, songs were changed to 20
-			if (buffslot == 54)
-				buffslot = 62;
 
 			__packet->WriteUInt32(buffslot);
 			__packet->WriteUInt32(emu->entries[i].spell_id);
@@ -1063,8 +1062,8 @@ namespace RoF2
 		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->drop_id);	// Some unique id
 		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, 0);	// Same for all objects in the zone
 		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->heading);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0);	// X tilt
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0);	// Y tilt
+		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->tilt_x);	// X tilt
+		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->tilt_y);	// Y tilt
 		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->size != 0 && (float)emu->size < 5000.f ? (float)((float)emu->size / 100.0f) : 1.f );	// This appears to be the size field. Hackish logic because some PEQ DB items were corrupt.
 		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->y);
 		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->x);

common/patches/sod.cpp

@@ -83,7 +83,7 @@ namespace SoD
 
 		//ok, now we have what we need to register.
 
-		EQStream::Signature signature;
+		EQStreamInterface::Signature signature;
 		std::string pname;
 
 		//register our world signature.
@@ -3246,8 +3246,10 @@ namespace SoD
 		DECODE_LENGTH_EXACT(structs::LoadSpellSet_Struct);
 		SETUP_DIRECT_DECODE(LoadSpellSet_Struct, structs::LoadSpellSet_Struct);
 
-		for (uint32 i = 0; i < MAX_PP_MEMSPELL; ++i)
+		for (int i = 0; i < structs::MAX_PP_MEMSPELL; ++i)
 			emu->spell[i] = eq->spell[i];
+		for (int i = structs::MAX_PP_MEMSPELL; i < MAX_PP_MEMSPELL; ++i)
+			emu->spell[i] = 0xFFFFFFFF;
 
 		FINISH_DIRECT_DECODE();
 	}

common/patches/sod_structs.h

@@ -1880,8 +1880,7 @@ struct Merchant_Sell_Struct {
 /*004*/	uint32	playerid;		// Player's entity id
 /*008*/	uint32	itemslot;
 /*012*/	uint32	unknown12;
-/*016*/	uint8	quantity;		// Already sold
-/*017*/ uint8	Unknown017[3];
+/*016*/	uint32	quantity;
 /*020*/	uint32	Unknown020;
 /*024*/	uint32	price;
 /*028*/	uint32	pricehighorderbits;	// It appears the price is 64 bits in SoD+

common/patches/sof.cpp

@@ -83,7 +83,7 @@ namespace SoF
 
 		//ok, now we have what we need to register.
 
-		EQStream::Signature signature;
+		EQStreamInterface::Signature signature;
 		std::string pname;
 
 		//register our world signature.
@@ -2623,6 +2623,21 @@ namespace SoF
 		FINISH_DIRECT_DECODE();
 	}
 
+	DECODE(OP_LoadSpellSet)
+	{
+		DECODE_LENGTH_EXACT(structs::LoadSpellSet_Struct);
+		SETUP_DIRECT_DECODE(LoadSpellSet_Struct, structs::LoadSpellSet_Struct);
+
+		for (int i = 0; i < structs::MAX_PP_MEMSPELL; ++i)
+			IN(spell[i]);
+		for (int i = structs::MAX_PP_MEMSPELL; i < MAX_PP_MEMSPELL; ++i)
+			emu->spell[i] = 0xFFFFFFFF;
+
+		IN(unknown);
+
+		FINISH_DIRECT_DECODE();
+	}
+
 	DECODE(OP_LootItem)
 	{
 		DECODE_LENGTH_EXACT(structs::LootingItem_Struct);

common/patches/sof_ops.h

@@ -111,6 +111,7 @@ D(OP_GroupFollow2)
 D(OP_InspectRequest)
 D(OP_ItemLinkClick)
 D(OP_ItemVerifyRequest)
+D(OP_LoadSpellSet)
 D(OP_LootItem)
 D(OP_MoveItem)
 D(OP_PetCommands)

common/patches/sof_structs.h

@@ -1859,8 +1859,7 @@ struct Merchant_Sell_Struct {
 /*004*/	uint32	playerid;		// Player's entity id
 /*008*/	uint32	itemslot;
 		uint32	unknown12;
-/*016*/	uint8	quantity;		// Already sold
-/*017*/ uint8	Unknown016[3];
+/*016*/	uint32	quantity;
 /*020*/ uint32	price;
 };
 struct Merchant_Purchase_Struct {
@@ -3729,6 +3728,11 @@ struct AnnoyingZoneUnknown_Struct {
 	uint32	value;		//always 4
 };
 
+struct LoadSpellSet_Struct {
+	uint32 spell[MAX_PP_MEMSPELL];
+	uint32 unknown;
+};
+
 struct BlockedBuffs_Struct {
 /*000*/	uint8	unknown000[80];
 /*080*/	uint8	unknown081;

common/patches/ss_declare.h

@@ -17,5 +17,5 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#define E(x) static void Encode_##x(EQApplicationPacket **p, std::shared_ptr<EQStream> dest, bool ack_req);
+#define E(x) static void Encode_##x(EQApplicationPacket **p, std::shared_ptr<EQStreamInterface> dest, bool ack_req);
 #define D(x) static void Decode_##x(EQApplicationPacket *p);

common/patches/ss_define.h

@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#define ENCODE(x) void Strategy::Encode_##x(EQApplicationPacket **p, std::shared_ptr<EQStream> dest, bool ack_req)
+#define ENCODE(x) void Strategy::Encode_##x(EQApplicationPacket **p, std::shared_ptr<EQStreamInterface> dest, bool ack_req)
 #define DECODE(x) void Strategy::Decode_##x(EQApplicationPacket *__packet)
 
 #define StructDist(in, f1, f2) (uint32(&in->f2)-uint32(&in->f1))

common/patches/titanium.cpp

@@ -82,7 +82,7 @@ namespace Titanium
 
 		//ok, now we have what we need to register.
 
-		EQStream::Signature signature;
+		EQStreamInterface::Signature signature;
 		std::string pname;
 
 		//register our world signature.
@@ -595,6 +595,46 @@ namespace Titanium
 		dest->FastQueuePacket(&in, ack_req);
 	}
 
+	ENCODE(OP_GroundSpawn)
+	{
+		// We are not encoding the spawn_id field here, but it doesn't appear to matter.
+		//
+		EQApplicationPacket *in = *p;
+		*p = nullptr;
+
+		//store away the emu struct
+		unsigned char *__emu_buffer = in->pBuffer;
+		Object_Struct *emu = (Object_Struct *)__emu_buffer;
+
+		in->size = strlen(emu->object_name) + sizeof(structs::Object_Struct) - 1;
+		in->pBuffer = new unsigned char[in->size];
+
+		structs::Object_Struct *eq = (structs::Object_Struct *) in->pBuffer;
+
+		eq->drop_id = emu->drop_id;
+		eq->heading = emu->heading;
+		eq->linked_list_addr[0] = 0;
+		eq->linked_list_addr[1] = 0;
+		strcpy(eq->object_name, emu->object_name);
+		eq->object_type = emu->object_type;
+		eq->spawn_id = 0;
+		eq->unknown008[0] = 0;
+		eq->unknown008[1] = 0;
+		eq->unknown020 = 0;
+		eq->unknown024 = 0;
+		eq->unknown076 = 0;
+		eq->unknown084 = 0xffffffff;
+		eq->z = emu->z;
+		eq->x = emu->x;
+		eq->y = emu->y;
+		eq->zone_id = emu->zone_id;
+		eq->zone_instance = emu->zone_instance;
+
+
+		delete[] __emu_buffer;
+		dest->FastQueuePacket(&in, ack_req);
+	}
+
 	ENCODE(OP_GuildMemberList)
 	{
 		//consume the packet
@@ -1938,6 +1978,21 @@ namespace Titanium
 		FINISH_DIRECT_DECODE();
 	}
 
+	DECODE(OP_LoadSpellSet)
+	{
+		DECODE_LENGTH_EXACT(structs::LoadSpellSet_Struct);
+		SETUP_DIRECT_DECODE(LoadSpellSet_Struct, structs::LoadSpellSet_Struct);
+
+		for (int i = 0; i < structs::MAX_PP_MEMSPELL; ++i)
+			IN(spell[i]);
+		for (int i = structs::MAX_PP_MEMSPELL; i < MAX_PP_MEMSPELL; ++i)
+			emu->spell[i] = 0xFFFFFFFF;
+
+		IN(unknown);
+
+		FINISH_DIRECT_DECODE();
+	}
+
 	DECODE(OP_LootItem)
 	{
 		DECODE_LENGTH_EXACT(structs::LootingItem_Struct);

common/patches/titanium_ops.h

@@ -40,6 +40,7 @@ E(OP_DzLeaderStatus)
 E(OP_DzMemberList)
 E(OP_Emote)
 E(OP_FormattedMessage)
+E(OP_GroundSpawn)
 E(OP_GuildMemberLevelUpdate)
 E(OP_GuildMemberList)
 E(OP_Illusion)
@@ -88,6 +89,7 @@ D(OP_InspectAnswer)
 D(OP_InspectRequest)
 D(OP_ItemLinkClick)
 D(OP_LFGuild)
+D(OP_LoadSpellSet)
 D(OP_LootItem)
 D(OP_MoveItem)
 D(OP_PetCommands)

common/patches/titanium_structs.h

@@ -1657,8 +1657,7 @@ struct Merchant_Sell_Struct {
 /*004*/	uint32	playerid;		// Player's entity id
 /*008*/	uint32	itemslot;
 		uint32	unknown12;
-/*016*/	uint8	quantity;		// Already sold
-/*017*/ uint8	Unknown016[3];
+/*016*/	uint32	quantity;
 /*020*/ uint32	price;
 };
 struct Merchant_Purchase_Struct {
@@ -3229,6 +3228,11 @@ struct AnnoyingZoneUnknown_Struct {
 	uint32	value;		//always 4
 };
 
+struct LoadSpellSet_Struct {
+	uint32 spell[MAX_PP_MEMSPELL];
+	uint32 unknown;
+};
+
 struct ApplyPoison_Struct {
 	uint32 inventorySlot;
 	uint32 success;

common/patches/uf.cpp

@@ -83,7 +83,7 @@ namespace UF
 
 		//ok, now we have what we need to register.
 
-		EQStream::Signature signature;
+		EQStreamInterface::Signature signature;
 		std::string pname;
 
 		//register our world signature.
@@ -410,13 +410,11 @@ namespace UF
 		for (uint16 i = 0; i < emu->count; ++i)
 		{
 			uint16 buffslot = emu->entries[i].buff_slot;
-			if (emu->entries[i].buff_slot >= 25 && emu->entries[i].buff_slot < 37)
-			{
-				buffslot += 5;
-			}
-			else if (emu->entries[i].buff_slot >= 37)
-			{
-				buffslot += 14;
+			if (emu->type == 0) { // only correct for self packets
+				if (emu->entries[i].buff_slot >= 25 && emu->entries[i].buff_slot < 37)
+					buffslot += 5;
+				else if (emu->entries[i].buff_slot >= 37)
+					buffslot += 14;
 			}
 
 			__packet->WriteUInt32(buffslot);
@@ -877,8 +875,8 @@ namespace UF
 		// This next field is actually a float. There is a groundspawn in freeportwest (sack of money sitting on some barrels) which requires this
 		// field to be set to (float)255.0 to appear at all, and also the size field below to be 5, to be the correct size. I think SoD has the same
 		// issue.
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0); //X tilt
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0);	//Y tilt
+		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->tilt_x); //X tilt
+		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->tilt_y);	//Y tilt
 		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->size != 0 && (float)emu->size < 5000.f ? (float)((float)emu->size / 100.0f) : 1.f );	// This appears to be the size field. Hackish logic because some PEQ DB items were corrupt.
 		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->y);
 		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->x);

common/patches/uf_structs.h

@@ -847,7 +847,7 @@ struct BindStruct {
  */
 static const uint32 MAX_PP_LANGUAGE		= 25; //
 static const uint32 MAX_PP_SPELLBOOK	= 720; // Confirmed 60 pages on Underfoot now
-static const uint32 MAX_PP_MEMSPELL		= 10; //was 9 now 10 on Underfoot
+static const uint32 MAX_PP_MEMSPELL		= 12; //was 9 now 10 on Underfoot
 static const uint32 MAX_PP_SKILL		= PACKET_SKILL_ARRAY_SIZE;	// 100 - actual skills buffer size
 static const uint32 MAX_PP_AA_ARRAY		= 300; //was 299
 static const uint32 MAX_GROUP_MEMBERS	= 6;
@@ -917,7 +917,7 @@ struct PlayerProfile_Struct
 /*00160*/ uint32  deity;				// deity
 /*00164*/ uint32  intoxication;			// Alcohol level (in ticks till sober?)
 /*00168*/ uint32  spellSlotRefresh[MAX_PP_MEMSPELL]; // Refresh time (millis) - 4 Octets Each
-/*00208*/ uint8   unknown00208[14];		// Seen 00 00 00 00 00 00 00 00 00 00 00 00 02 01
+/*00208*/ uint8   unknown00208[6];		// Seen 00 00 00 00 00 00 00 00 00 00 00 00 02 01
 /*00222*/ uint32  abilitySlotRefresh;
 /*00226*/ uint8   haircolor;			// Player hair color
 /*00227*/ uint8   beardcolor;			// Player beard color
@@ -945,7 +945,7 @@ struct PlayerProfile_Struct
 /*04217*/ uint8   unknown04217[147];		// was [175]
 /*04364*/ uint32   spell_book[MAX_PP_SPELLBOOK];	// List of the Spells in spellbook 720 = 90 pages [2880] was [1920]
 /*07244*/ uint32   mem_spells[MAX_PP_MEMSPELL]; // List of spells memorized
-/*07284*/ uint8   unknown07284[28];		//#### uint8 unknown04396[32]; in Titanium ####[28]
+/*07284*/ uint8   unknown07284[20];		//#### uint8 unknown04396[32]; in Titanium ####[28]
 /*07312*/ uint32  platinum;				// Platinum Pieces on player
 /*07316*/ uint32  gold;					// Gold Pieces on player
 /*07320*/ uint32  silver;				// Silver Pieces on player
@@ -1921,8 +1921,7 @@ struct Merchant_Sell_Struct {
 /*004*/	uint32	playerid;		// Player's entity id
 /*008*/	uint32	itemslot;
 /*012*/	uint32	unknown12;
-/*016*/	uint8	quantity;		// Already sold
-/*017*/ uint8	Unknown017[3];
+/*016*/	uint32	quantity;
 /*020*/	uint32	Unknown020;
 /*024*/	uint32	price;
 /*028*/	uint32	pricehighorderbits;	// It appears the price is 64 bits in Underfoot+
@@ -3929,7 +3928,6 @@ struct AnnoyingZoneUnknown_Struct {
 
 struct LoadSpellSet_Struct {
       uint8  spell[MAX_PP_MEMSPELL];      // 0 if no action
-      uint16 unknown2;	// is this two more spell gems?
       uint32 unknown;	// there seems to be an extra field in this packet...
 };
 

common/platform.h

@@ -8,7 +8,7 @@ enum EQEmuExePlatform
 	ExePlatformWorld,
 	ExePlatformLogin,
 	ExePlatformQueryServ,
-	ExePlatformWebInterface,
+	ExePlatformSocket_Server,
 	ExePlatformUCS,
 	ExePlatformLaunch,
 	ExePlatformSharedMemory,

common/rapidjson/rapidjson/allocators.h

@@ -1,226 +0,0 @@
-#ifndef RAPIDJSON_ALLOCATORS_H_
-#define RAPIDJSON_ALLOCATORS_H_
-
-#include "rapidjson.h"
-
-namespace rapidjson {
-
-///////////////////////////////////////////////////////////////////////////////
-// Allocator
-
-/*! \class rapidjson::Allocator
-	\brief Concept for allocating, resizing and freeing memory block.
-	
-	Note that Malloc() and Realloc() are non-static but Free() is static.
-	
-	So if an allocator need to support Free(), it needs to put its pointer in 
-	the header of memory block.
-
-\code
-concept Allocator {
-	static const bool kNeedFree;	//!< Whether this allocator needs to call Free().
-
-	// Allocate a memory block.
-	// \param size of the memory block in bytes.
-	// \returns pointer to the memory block.
-	void* Malloc(size_t size);
-
-	// Resize a memory block.
-	// \param originalPtr The pointer to current memory block. Null pointer is permitted.
-	// \param originalSize The current size in bytes. (Design issue: since some allocator may not book-keep this, explicitly pass to it can save memory.)
-	// \param newSize the new size in bytes.
-	void* Realloc(void* originalPtr, size_t originalSize, size_t newSize);
-
-	// Free a memory block.
-	// \param pointer to the memory block. Null pointer is permitted.
-	static void Free(void *ptr);
-};
-\endcode
-*/
-
-///////////////////////////////////////////////////////////////////////////////
-// CrtAllocator
-
-//! C-runtime library allocator.
-/*! This class is just wrapper for standard C library memory routines.
-	\note implements Allocator concept
-*/
-class CrtAllocator {
-public:
-	static const bool kNeedFree = true;
-	void* Malloc(size_t size) { return malloc(size); }
-	void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) { (void)originalSize; return realloc(originalPtr, newSize); }
-	static void Free(void *ptr) { free(ptr); }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// MemoryPoolAllocator
-
-//! Default memory allocator used by the parser and DOM.
-/*! This allocator allocate memory blocks from pre-allocated memory chunks. 
-
-    It does not free memory blocks. And Realloc() only allocate new memory.
-
-    The memory chunks are allocated by BaseAllocator, which is CrtAllocator by default.
-
-    User may also supply a buffer as the first chunk.
-
-    If the user-buffer is full then additional chunks are allocated by BaseAllocator.
-
-    The user-buffer is not deallocated by this allocator.
-
-    \tparam BaseAllocator the allocator type for allocating memory chunks. Default is CrtAllocator.
-	\note implements Allocator concept
-*/
-template <typename BaseAllocator = CrtAllocator>
-class MemoryPoolAllocator {
-public:
-	static const bool kNeedFree = false;	//!< Tell users that no need to call Free() with this allocator. (concept Allocator)
-
-	//! Constructor with chunkSize.
-	/*! \param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
-		\param baseAllocator The allocator for allocating memory chunks.
-	*/
-	MemoryPoolAllocator(size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) : 
-		chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(0), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
-	{
-		if (!baseAllocator_)
-			ownBaseAllocator_ = baseAllocator_ = new BaseAllocator();
-		AddChunk(chunk_capacity_);
-	}
-
-	//! Constructor with user-supplied buffer.
-	/*! The user buffer will be used firstly. When it is full, memory pool allocates new chunk with chunk size.
-
-		The user buffer will not be deallocated when this allocator is destructed.
-
-		\param buffer User supplied buffer.
-		\param size Size of the buffer in bytes. It must at least larger than sizeof(ChunkHeader).
-		\param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
-		\param baseAllocator The allocator for allocating memory chunks.
-	*/
-	MemoryPoolAllocator(void *buffer, size_t size, size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) :
-		chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(buffer), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
-	{
-		RAPIDJSON_ASSERT(buffer != 0);
-		RAPIDJSON_ASSERT(size > sizeof(ChunkHeader));
-		chunkHead_ = reinterpret_cast<ChunkHeader*>(buffer);
-		chunkHead_->capacity = size - sizeof(ChunkHeader);
-		chunkHead_->size = 0;
-		chunkHead_->next = 0;
-	}
-
-	//! Destructor.
-	/*! This deallocates all memory chunks, excluding the user-supplied buffer.
-	*/
-	~MemoryPoolAllocator() {
-		Clear();
-		delete ownBaseAllocator_;
-	}
-
-	//! Deallocates all memory chunks, excluding the user-supplied buffer.
-	void Clear() {
-		while(chunkHead_ != 0 && chunkHead_ != userBuffer_) {
-			ChunkHeader* next = chunkHead_->next;
-			baseAllocator_->Free(chunkHead_);
-			chunkHead_ = next;
-		}
-	}
-
-	//! Computes the total capacity of allocated memory chunks.
-	/*! \return total capacity in bytes.
-	*/
-	size_t Capacity() const {
-		size_t capacity = 0;
-		for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
-			capacity += c->capacity;
-		return capacity;
-	}
-
-	//! Computes the memory blocks allocated.
-	/*! \return total used bytes.
-	*/
-	size_t Size() const {
-		size_t size = 0;
-		for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
-			size += c->size;
-		return size;
-	}
-
-	//! Allocates a memory block. (concept Allocator)
-	void* Malloc(size_t size) {
-		size = RAPIDJSON_ALIGN(size);
-		if (chunkHead_->size + size > chunkHead_->capacity)
-			AddChunk(chunk_capacity_ > size ? chunk_capacity_ : size);
-
-		void *buffer = reinterpret_cast<char *>(chunkHead_ + 1) + chunkHead_->size;
-		chunkHead_->size += size;
-		return buffer;
-	}
-
-	//! Resizes a memory block (concept Allocator)
-	void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) {
-		if (originalPtr == 0)
-			return Malloc(newSize);
-
-		// Do not shrink if new size is smaller than original
-		if (originalSize >= newSize)
-			return originalPtr;
-
-		// Simply expand it if it is the last allocation and there is sufficient space
-		if (originalPtr == (char *)(chunkHead_ + 1) + chunkHead_->size - originalSize) {
-			size_t increment = static_cast<size_t>(newSize - originalSize);
-			increment = RAPIDJSON_ALIGN(increment);
-			if (chunkHead_->size + increment <= chunkHead_->capacity) {
-				chunkHead_->size += increment;
-				return originalPtr;
-			}
-		}
-
-		// Realloc process: allocate and copy memory, do not free original buffer.
-		void* newBuffer = Malloc(newSize);
-		RAPIDJSON_ASSERT(newBuffer != 0);	// Do not handle out-of-memory explicitly.
-		return memcpy(newBuffer, originalPtr, originalSize);
-	}
-
-	//! Frees a memory block (concept Allocator)
-	static void Free(void *ptr) { (void)ptr; } // Do nothing
-
-private:
-	//! Copy constructor is not permitted.
-	MemoryPoolAllocator(const MemoryPoolAllocator& rhs) /* = delete */;
-	//! Copy assignment operator is not permitted.
-	MemoryPoolAllocator& operator=(const MemoryPoolAllocator& rhs) /* = delete */;
-
-	//! Creates a new chunk.
-	/*! \param capacity Capacity of the chunk in bytes.
-	*/
-	void AddChunk(size_t capacity) {
-		ChunkHeader* chunk = reinterpret_cast<ChunkHeader*>(baseAllocator_->Malloc(sizeof(ChunkHeader) + capacity));
-		chunk->capacity = capacity;
-		chunk->size = 0;
-		chunk->next = chunkHead_;
-		chunkHead_ =  chunk;
-	}
-
-	static const int kDefaultChunkCapacity = 64 * 1024; //!< Default chunk capacity.
-
-	//! Chunk header for perpending to each chunk.
-	/*! Chunks are stored as a singly linked list.
-	*/
-	struct ChunkHeader {
-		size_t capacity;	//!< Capacity of the chunk in bytes (excluding the header itself).
-		size_t size;		//!< Current size of allocated memory in bytes.
-		ChunkHeader *next;	//!< Next chunk in the linked list.
-	};
-
-	ChunkHeader *chunkHead_;	//!< Head of the chunk linked-list. Only the head chunk serves allocation.
-	size_t chunk_capacity_;		//!< The minimum capacity of chunk when they are allocated.
-	void *userBuffer_;			//!< User supplied buffer.
-	BaseAllocator* baseAllocator_;	//!< base allocator for allocating memory chunks.
-	BaseAllocator* ownBaseAllocator_;	//!< base allocator created by this object.
-};
-
-} // namespace rapidjson
-
-#endif // RAPIDJSON_ENCODINGS_H_

common/rapidjson/rapidjson/encodedstream.h

@@ -1,270 +0,0 @@
-#ifndef RAPIDJSON_ENCODEDSTREAM_H_
-#define RAPIDJSON_ENCODEDSTREAM_H_
-
-#include "rapidjson.h"
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-namespace rapidjson {
-
-//! Input byte stream wrapper with a statically bound encoding.
-/*!
-	\tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.
-	\tparam InputByteStream Type of input byte stream. For example, FileReadStream.
-*/
-template <typename Encoding, typename InputByteStream>
-class EncodedInputStream {
-	RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-public:
-	typedef typename Encoding::Ch Ch;
-
-	EncodedInputStream(InputByteStream& is) : is_(is) { 
-		current_ = Encoding::TakeBOM(is_);
-	}
-
-	Ch Peek() const { return current_; }
-	Ch Take() { Ch c = current_; current_ = Encoding::Take(is_); return c; }
-	size_t Tell() const { return is_.Tell(); }
-
-	// Not implemented
-	void Put(Ch) { RAPIDJSON_ASSERT(false); }
-	void Flush() { RAPIDJSON_ASSERT(false); } 
-	Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-	size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-	EncodedInputStream(const EncodedInputStream&);
-	EncodedInputStream& operator=(const EncodedInputStream&);
-
-	InputByteStream& is_;
-	Ch current_;
-};
-
-//! Output byte stream wrapper with statically bound encoding.
-/*!
-	\tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.
-	\tparam InputByteStream Type of input byte stream. For example, FileWriteStream.
-*/
-template <typename Encoding, typename OutputByteStream>
-class EncodedOutputStream {
-	RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-public:
-	typedef typename Encoding::Ch Ch;
-
-	EncodedOutputStream(OutputByteStream& os, bool putBOM = true) : os_(os) { 
-		if (putBOM)
-			Encoding::PutBOM(os_);
-	}
-
-	void Put(Ch c) { Encoding::Put(os_, c);  }
-	void Flush() { os_.Flush(); }
-
-	// Not implemented
-	Ch Peek() const { RAPIDJSON_ASSERT(false); }
-	Ch Take() { RAPIDJSON_ASSERT(false);  }
-	size_t Tell() const { RAPIDJSON_ASSERT(false);  return 0; }
-	Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-	size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-	EncodedOutputStream(const EncodedOutputStream&);
-	EncodedOutputStream& operator=(const EncodedOutputStream&);
-
-	OutputByteStream& os_;
-};
-
-#define RAPIDJSON_ENCODINGS_FUNC(x) UTF8<Ch>::x, UTF16LE<Ch>::x, UTF16BE<Ch>::x, UTF32LE<Ch>::x, UTF32BE<Ch>::x
-
-//! Input stream wrapper with dynamically bound encoding and automatic encoding detection.
-/*!
-	\tparam CharType Type of character for reading.
-	\tparam InputByteStream type of input byte stream to be wrapped.
-*/
-template <typename CharType, typename InputByteStream>
-class AutoUTFInputStream {
-	RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-public:
-	typedef CharType Ch;
-
-	//! Constructor.
-	/*!
-		\param is input stream to be wrapped.
-		\param type UTF encoding type if it is not detected from the stream.
-	*/
-	AutoUTFInputStream(InputByteStream& is, UTFType type = kUTF8) : is_(&is), type_(type), hasBOM_(false) {
-		DetectType();
-		static const TakeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Take) };
-		takeFunc_ = f[type_];
-		current_ = takeFunc_(*is_);
-	}
-
-	UTFType GetType() const { return type_; }
-	bool HasBOM() const { return hasBOM_; }
-
-	Ch Peek() const { return current_; }
-	Ch Take() { Ch c = current_; current_ = takeFunc_(*is_); return c; }
-	size_t Tell() const { return is_->Tell(); }
-
-	// Not implemented
-	void Put(Ch) { RAPIDJSON_ASSERT(false); }
-	void Flush() { RAPIDJSON_ASSERT(false); } 
-	Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-	size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-	AutoUTFInputStream(const AutoUTFInputStream&);
-	AutoUTFInputStream& operator=(const AutoUTFInputStream&);
-
-	// Detect encoding type with BOM or RFC 4627
-	void DetectType() {
-		// BOM (Byte Order Mark):
-		// 00 00 FE FF  UTF-32BE
-		// FF FE 00 00  UTF-32LE
-		// FE FF		UTF-16BE
-		// FF FE		UTF-16LE
-		// EF BB BF		UTF-8
-
-		const unsigned char* c = (const unsigned char *)is_->Peek4();
-		if (!c)
-			return;
-
-		unsigned bom = c[0] | (c[1] << 8) | (c[2] << 16) | (c[3] << 24);
-		hasBOM_ = false;
-		if (bom == 0xFFFE0000)					{ type_ = kUTF32BE; hasBOM_ = true; is_->Take(); is_->Take(); is_->Take(); is_->Take(); }
-		else if (bom == 0x0000FEFF)				{ type_ = kUTF32LE;	hasBOM_ = true;	is_->Take(); is_->Take(); is_->Take(); is_->Take();	}
-		else if ((bom & 0xFFFF) == 0xFFFE)		{ type_ = kUTF16BE; hasBOM_ = true; is_->Take(); is_->Take();							}
-		else if ((bom & 0xFFFF) == 0xFEFF)		{ type_ = kUTF16LE; hasBOM_ = true; is_->Take(); is_->Take();							}
-		else if ((bom & 0xFFFFFF) == 0xBFBBEF)	{ type_ = kUTF8;	hasBOM_ = true; is_->Take(); is_->Take(); is_->Take();				}
-
-		// RFC 4627: Section 3
-		// "Since the first two characters of a JSON text will always be ASCII
-		// characters [RFC0020], it is possible to determine whether an octet
-		// stream is UTF-8, UTF-16 (BE or LE), or UTF-32 (BE or LE) by looking
-		// at the pattern of nulls in the first four octets."
-		// 00 00 00 xx  UTF-32BE
-		// 00 xx 00 xx  UTF-16BE
-		// xx 00 00 00  UTF-32LE
-		// xx 00 xx 00  UTF-16LE
-		// xx xx xx xx  UTF-8
-
-		if (!hasBOM_) {
-			unsigned pattern = (c[0] ? 1 : 0) | (c[1] ? 2 : 0) | (c[2] ? 4 : 0) | (c[3] ? 8 : 0);
-			switch (pattern) {
-			case 0x08: type_ = kUTF32BE; break;
-			case 0x0A: type_ = kUTF16BE; break;
-			case 0x01: type_ = kUTF32LE; break;
-			case 0x05: type_ = kUTF16LE; break;
-			case 0x0F: type_ = kUTF8;    break;
-			default: break; // Use type defined by user.
-			}
-		}
-
-		// Runtime check whether the size of character type is sufficient. It only perform checks with assertion.
-		switch (type_) {
-		case kUTF8:
-			// Do nothing
-			break;
-		case kUTF16LE:
-		case kUTF16BE:
-			RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
-			break;
-		case kUTF32LE:
-		case kUTF32BE:
-			RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
-			break;
-		default:
-			RAPIDJSON_ASSERT(false);	// Invalid type
-		}
-	}
-
-	typedef Ch (*TakeFunc)(InputByteStream& is);
-	InputByteStream* is_;
-	UTFType type_;
-	Ch current_;
-	TakeFunc takeFunc_;
-	bool hasBOM_;
-};
-
-//! Output stream wrapper with dynamically bound encoding and automatic encoding detection.
-/*!
-	\tparam CharType Type of character for writing.
-	\tparam InputByteStream type of output byte stream to be wrapped.
-*/
-template <typename CharType, typename OutputByteStream>
-class AutoUTFOutputStream {
-	RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-public:
-	typedef CharType Ch;
-
-	//! Constructor.
-	/*!
-		\param os output stream to be wrapped.
-		\param type UTF encoding type.
-		\param putBOM Whether to write BOM at the beginning of the stream.
-	*/
-	AutoUTFOutputStream(OutputByteStream& os, UTFType type, bool putBOM) : os_(&os), type_(type) {
-		// RUntime check whether the size of character type is sufficient. It only perform checks with assertion.
-		switch (type_) {
-		case kUTF16LE:
-		case kUTF16BE:
-			RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
-			break;
-		case kUTF32LE:
-		case kUTF32BE:
-			RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
-			break;
-		case kUTF8:
-			// Do nothing
-			break;
-		default:
-			RAPIDJSON_ASSERT(false);	// Invalid UTFType
-		}
-
-		static const PutFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Put) };
-		putFunc_ = f[type_];
-
-		if (putBOM)
-			PutBOM();
-	}
-
-	UTFType GetType() const { return type_; }
-
-	void Put(Ch c) { putFunc_(*os_, c); }
-	void Flush() { os_->Flush(); } 
-
-	// Not implemented
-	Ch Peek() const { RAPIDJSON_ASSERT(false); }
-	Ch Take() { RAPIDJSON_ASSERT(false); }
-	size_t Tell() const { RAPIDJSON_ASSERT(false); return 0; }
-	Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-	size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-	AutoUTFOutputStream(const AutoUTFOutputStream&);
-	AutoUTFOutputStream& operator=(const AutoUTFOutputStream&);
-
-	void PutBOM() { 
-		typedef void (*PutBOMFunc)(OutputByteStream&);
-		static const PutBOMFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(PutBOM) };
-		f[type_](*os_);
-	}
-
-	typedef void (*PutFunc)(OutputByteStream&, Ch);
-
-	OutputByteStream* os_;
-	UTFType type_;
-	PutFunc putFunc_;
-};
-
-#undef RAPIDJSON_ENCODINGS_FUNC
-
-} // namespace rapidjson
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_FILESTREAM_H_

common/rapidjson/rapidjson/encodings.h

@@ -1,610 +0,0 @@
-#ifndef RAPIDJSON_ENCODINGS_H_
-#define RAPIDJSON_ENCODINGS_H_
-
-#include "rapidjson.h"
-
-#ifdef _MSC_VER
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4244) // conversion from 'type1' to 'type2', possible loss of data
-RAPIDJSON_DIAG_OFF(4702)  // unreachable code
-#elif defined(__GNUC__)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-namespace rapidjson {
-
-///////////////////////////////////////////////////////////////////////////////
-// Encoding
-
-/*! \class rapidjson::Encoding
-	\brief Concept for encoding of Unicode characters.
-
-\code
-concept Encoding {
-	typename Ch;	//! Type of character. A "character" is actually a code unit in unicode's definition.
-
-	enum { supportUnicode = 1 }; // or 0 if not supporting unicode
-
-	//! \brief Encode a Unicode codepoint to an output stream.
-	//! \param os Output stream.
-	//! \param codepoint An unicode codepoint, ranging from 0x0 to 0x10FFFF inclusively.
-	template<typename OutputStream>
-	static void Encode(OutputStream& os, unsigned codepoint);
-
-	//! \brief Decode a Unicode codepoint from an input stream.
-	//! \param is Input stream.
-	//! \param codepoint Output of the unicode codepoint.
-	//! \return true if a valid codepoint can be decoded from the stream.
-	template <typename InputStream>
-	static bool Decode(InputStream& is, unsigned* codepoint);
-
-	//! \brief Validate one Unicode codepoint from an encoded stream.
-	//! \param is Input stream to obtain codepoint.
-	//! \param os Output for copying one codepoint.
-	//! \return true if it is valid.
-	//! \note This function just validating and copying the codepoint without actually decode it.
-	template <typename InputStream, typename OutputStream>
-	static bool Validate(InputStream& is, OutputStream& os);
-
-	// The following functions are deal with byte streams.
-
-	//! Take a character from input byte stream, skip BOM if exist.
-	template <typename InputByteStream>
-	static CharType TakeBOM(InputByteStream& is);
-
-	//! Take a character from input byte stream.
-	template <typename InputByteStream>
-	static Ch Take(InputByteStream& is);
-
-	//! Put BOM to output byte stream.
-	template <typename OutputByteStream>
-	static void PutBOM(OutputByteStream& os);
-
-	//! Put a character to output byte stream.
-	template <typename OutputByteStream>
-	static void Put(OutputByteStream& os, Ch c);
-};
-\endcode
-*/
-
-///////////////////////////////////////////////////////////////////////////////
-// UTF8
-
-//! UTF-8 encoding.
-/*! http://en.wikipedia.org/wiki/UTF-8
-	http://tools.ietf.org/html/rfc3629
-	\tparam CharType Code unit for storing 8-bit UTF-8 data. Default is char.
-	\note implements Encoding concept
-*/
-template<typename CharType = char>
-struct UTF8 {
-	typedef CharType Ch;
-
-	enum { supportUnicode = 1 };
-
-	template<typename OutputStream>
-	static void Encode(OutputStream& os, unsigned codepoint) {
-		if (codepoint <= 0x7F) 
-			os.Put(static_cast<Ch>(codepoint & 0xFF));
-		else if (codepoint <= 0x7FF) {
-			os.Put(static_cast<Ch>(0xC0 | ((codepoint >> 6) & 0xFF)));
-			os.Put(static_cast<Ch>(0x80 | ((codepoint & 0x3F))));
-		}
-		else if (codepoint <= 0xFFFF) {
-			os.Put(static_cast<Ch>(0xE0 | ((codepoint >> 12) & 0xFF)));
-			os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
-			os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
-		}
-		else {
-			RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-			os.Put(static_cast<Ch>(0xF0 | ((codepoint >> 18) & 0xFF)));
-			os.Put(static_cast<Ch>(0x80 | ((codepoint >> 12) & 0x3F)));
-			os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
-			os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
-		}
-	}
-
-	template <typename InputStream>
-	static bool Decode(InputStream& is, unsigned* codepoint) {
-#define COPY() c = is.Take(); *codepoint = (*codepoint << 6) | ((unsigned char)c & 0x3Fu)
-#define TRANS(mask) result &= ((GetRange((unsigned char)c) & mask) != 0)
-#define TAIL() COPY(); TRANS(0x70)
-		Ch c = is.Take();
-		if (!(c & 0x80)) {
-			*codepoint = (unsigned char)c;
-			return true;
-		}
-
-		unsigned char type = GetRange((unsigned char)c);
-		*codepoint = (0xFF >> type) & (unsigned char)c;
-		bool result = true;
-		switch (type) {
-		case 2:	TAIL(); return result;
-		case 3:	TAIL(); TAIL(); return result;
-		case 4:	COPY(); TRANS(0x50); TAIL(); return result;
-		case 5:	COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
-		case 6: TAIL(); TAIL(); TAIL(); return result;
-		case 10: COPY(); TRANS(0x20); TAIL(); return result;
-		case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
-		default: return false;
-		}
-#undef COPY
-#undef TRANS
-#undef TAIL
-	}
-
-	template <typename InputStream, typename OutputStream>
-	static bool Validate(InputStream& is, OutputStream& os) {
-#define COPY() os.Put(c = is.Take())
-#define TRANS(mask) result &= ((GetRange((unsigned char)c) & mask) != 0)
-#define TAIL() COPY(); TRANS(0x70)
-		Ch c;
-		COPY();
-		if (!(c & 0x80))
-			return true;
-
-		bool result = true;
-		switch (GetRange((unsigned char)c)) {
-		case 2:	TAIL(); return result;
-		case 3:	TAIL(); TAIL(); return result;
-		case 4:	COPY(); TRANS(0x50); TAIL(); return result;
-		case 5:	COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
-		case 6: TAIL(); TAIL(); TAIL(); return result;
-		case 10: COPY(); TRANS(0x20); TAIL(); return result;
-		case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
-		default: return false;
-		}
-#undef COPY
-#undef TRANS
-#undef TAIL
-	}
-
-	static unsigned char GetRange(unsigned char c) {
-		// Referring to DFA of http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
-		// With new mapping 1 -> 0x10, 7 -> 0x20, 9 -> 0x40, such that AND operation can test multiple types.
-		static const unsigned char type[] = {
-			0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-			0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-			0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-			0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-			0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,
-			0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
-			0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-			0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-			8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-			10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8,
-		};
-		return type[c];
-	}
-
-	template <typename InputByteStream>
-	static CharType TakeBOM(InputByteStream& is) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-		Ch c = Take(is);
-		if ((unsigned char)c != 0xEFu) return c;
-		c = is.Take();
-		if ((unsigned char)c != 0xBBu) return c;
-		c = is.Take();
-		if ((unsigned char)c != 0xBFu) return c;
-		c = is.Take();
-		return c;
-	}
-
-	template <typename InputByteStream>
-	static Ch Take(InputByteStream& is) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-		return is.Take();
-	}
-
-	template <typename OutputByteStream>
-	static void PutBOM(OutputByteStream& os) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-		os.Put(0xEFu); os.Put(0xBBu); os.Put(0xBFu);
-	}
-
-	template <typename OutputByteStream>
-	static void Put(OutputByteStream& os, Ch c) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-		os.Put(static_cast<typename OutputByteStream::Ch>(c));
-	}
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// UTF16
-
-//! UTF-16 encoding.
-/*! http://en.wikipedia.org/wiki/UTF-16
-	http://tools.ietf.org/html/rfc2781
-	\tparam CharType Type for storing 16-bit UTF-16 data. Default is wchar_t. C++11 may use char16_t instead.
-	\note implements Encoding concept
-
-	\note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
-	For streaming, use UTF16LE and UTF16BE, which handle endianness.
-*/
-template<typename CharType = wchar_t>
-struct UTF16 {
-	typedef CharType Ch;
-	RAPIDJSON_STATIC_ASSERT(sizeof(Ch) >= 2);
-
-	enum { supportUnicode = 1 };
-
-	template<typename OutputStream>
-	static void Encode(OutputStream& os, unsigned codepoint) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
-		if (codepoint <= 0xFFFF) {
-			RAPIDJSON_ASSERT(codepoint < 0xD800 || codepoint > 0xDFFF); // Code point itself cannot be surrogate pair 
-			os.Put(static_cast<typename OutputStream::Ch>(codepoint));
-		}
-		else {
-			RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-			unsigned v = codepoint - 0x10000;
-			os.Put(static_cast<typename OutputStream::Ch>((v >> 10) | 0xD800));
-			os.Put((v & 0x3FF) | 0xDC00);
-		}
-	}
-
-	template <typename InputStream>
-	static bool Decode(InputStream& is, unsigned* codepoint) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
-		Ch c = is.Take();
-		if (c < 0xD800 || c > 0xDFFF) {
-			*codepoint = c;
-			return true;
-		}
-		else if (c <= 0xDBFF) {
-			*codepoint = (c & 0x3FF) << 10;
-			c = is.Take();
-			*codepoint |= (c & 0x3FF);
-			*codepoint += 0x10000;
-			return c >= 0xDC00 && c <= 0xDFFF;
-		}
-		return false;
-	}
-
-	template <typename InputStream, typename OutputStream>
-	static bool Validate(InputStream& is, OutputStream& os) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
-		Ch c;
-		os.Put(c = is.Take());
-		if (c < 0xD800 || c > 0xDFFF)
-			return true;
-		else if (c <= 0xDBFF) {
-			os.Put(c = is.Take());
-			return c >= 0xDC00 && c <= 0xDFFF;
-		}
-		return false;
-	}
-};
-
-//! UTF-16 little endian encoding.
-template<typename CharType = wchar_t>
-struct UTF16LE : UTF16<CharType> {
-	template <typename InputByteStream>
-	static CharType TakeBOM(InputByteStream& is) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-		CharType c = Take(is);
-		return (unsigned short)c == 0xFEFFu ? Take(is) : c;
-	}
-
-	template <typename InputByteStream>
-	static CharType Take(InputByteStream& is) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-		CharType c = (unsigned char)is.Take();
-		c |= (unsigned char)is.Take() << 8;
-		return c;
-	}
-
-	template <typename OutputByteStream>
-	static void PutBOM(OutputByteStream& os) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-		os.Put(0xFFu); os.Put(0xFEu);
-	}
-
-	template <typename OutputByteStream>
-	static void Put(OutputByteStream& os, CharType c) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-		os.Put(c & 0xFFu);
-		os.Put((c >> 8) & 0xFFu);
-	}
-};
-
-//! UTF-16 big endian encoding.
-template<typename CharType = wchar_t>
-struct UTF16BE : UTF16<CharType> {
-	template <typename InputByteStream>
-	static CharType TakeBOM(InputByteStream& is) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-		CharType c = Take(is);
-		return (unsigned short)c == 0xFEFFu ? Take(is) : c;
-	}
-
-	template <typename InputByteStream>
-	static CharType Take(InputByteStream& is) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-		CharType c = (unsigned char)is.Take() << 8;
-		c |= (unsigned char)is.Take();
-		return c;
-	}
-
-	template <typename OutputByteStream>
-	static void PutBOM(OutputByteStream& os) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-		os.Put(0xFEu); os.Put(0xFFu);
-	}
-
-	template <typename OutputByteStream>
-	static void Put(OutputByteStream& os, CharType c) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-		os.Put((c >> 8) & 0xFFu);
-		os.Put(c & 0xFFu);
-	}
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// UTF32
-
-//! UTF-32 encoding. 
-/*! http://en.wikipedia.org/wiki/UTF-32
-	\tparam CharType Type for storing 32-bit UTF-32 data. Default is unsigned. C++11 may use char32_t instead.
-	\note implements Encoding concept
-
-	\note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
-	For streaming, use UTF32LE and UTF32BE, which handle endianness.
-*/
-template<typename CharType = unsigned>
-struct UTF32 {
-	typedef CharType Ch;
-	RAPIDJSON_STATIC_ASSERT(sizeof(Ch) >= 4);
-
-	enum { supportUnicode = 1 };
-
-	template<typename OutputStream>
-	static void Encode(OutputStream& os, unsigned codepoint) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 4);
-		RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-		os.Put(codepoint);
-	}
-
-	template <typename InputStream>
-	static bool Decode(InputStream& is, unsigned* codepoint) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
-		Ch c = is.Take();
-		*codepoint = c;
-		return c <= 0x10FFFF;
-	}
-
-	template <typename InputStream, typename OutputStream>
-	static bool Validate(InputStream& is, OutputStream& os) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
-		Ch c;
-		os.Put(c = is.Take());
-		return c <= 0x10FFFF;
-	}
-};
-
-//! UTF-32 little endian enocoding.
-template<typename CharType = unsigned>
-struct UTF32LE : UTF32<CharType> {
-	template <typename InputByteStream>
-	static CharType TakeBOM(InputByteStream& is) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-		CharType c = Take(is);
-		return (unsigned)c == 0x0000FEFFu ? Take(is) : c;
-	}
-
-	template <typename InputByteStream>
-	static CharType Take(InputByteStream& is) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-		CharType c = (unsigned char)is.Take();
-		c |= (unsigned char)is.Take() << 8;
-		c |= (unsigned char)is.Take() << 16;
-		c |= (unsigned char)is.Take() << 24;
-		return c;
-	}
-
-	template <typename OutputByteStream>
-	static void PutBOM(OutputByteStream& os) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-		os.Put(0xFFu); os.Put(0xFEu); os.Put(0x00u); os.Put(0x00u);
-	}
-
-	template <typename OutputByteStream>
-	static void Put(OutputByteStream& os, CharType c) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-		os.Put(c & 0xFFu);
-		os.Put((c >> 8) & 0xFFu);
-		os.Put((c >> 16) & 0xFFu);
-		os.Put((c >> 24) & 0xFFu);
-	}
-};
-
-//! UTF-32 big endian encoding.
-template<typename CharType = unsigned>
-struct UTF32BE : UTF32<CharType> {
-	template <typename InputByteStream>
-	static CharType TakeBOM(InputByteStream& is) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-		CharType c = Take(is);
-		return (unsigned)c == 0x0000FEFFu ? Take(is) : c; 
-	}
-
-	template <typename InputByteStream>
-	static CharType Take(InputByteStream& is) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-		CharType c = (unsigned char)is.Take() << 24;
-		c |= (unsigned char)is.Take() << 16;
-		c |= (unsigned char)is.Take() << 8;
-		c |= (unsigned char)is.Take();
-		return c;
-	}
-
-	template <typename OutputByteStream>
-	static void PutBOM(OutputByteStream& os) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-		os.Put(0x00u); os.Put(0x00u); os.Put(0xFEu); os.Put(0xFFu);
-	}
-
-	template <typename OutputByteStream>
-	static void Put(OutputByteStream& os, CharType c) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-		os.Put((c >> 24) & 0xFFu);
-		os.Put((c >> 16) & 0xFFu);
-		os.Put((c >> 8) & 0xFFu);
-		os.Put(c & 0xFFu);
-	}
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// ASCII
-
-//! ASCII encoding.
-/*! http://en.wikipedia.org/wiki/ASCII
-	\tparam CharType Code unit for storing 7-bit ASCII data. Default is char.
-	\note implements Encoding concept
-*/
-template<typename CharType = char>
-struct ASCII {
-	typedef CharType Ch;
-
-	enum { supportUnicode = 0 };
-
-	template<typename OutputStream>
-	static void Encode(OutputStream& os, unsigned codepoint) {
-		RAPIDJSON_ASSERT(codepoint <= 0x7F);
-		os.Put(static_cast<Ch>(codepoint & 0xFF));
-	}
-
-	template <typename InputStream>
-	static bool Decode(InputStream& is, unsigned* codepoint) {
-		unsigned char c = static_cast<unsigned char>(is.Take());
-		*codepoint = c;
-		return c <= 0X7F;
-	}
-
-	template <typename InputStream, typename OutputStream>
-	static bool Validate(InputStream& is, OutputStream& os) {
-		unsigned char c = is.Take();
-		os.Put(c);
-		return c <= 0x7F;
-	}
-
-	template <typename InputByteStream>
-	static CharType TakeBOM(InputByteStream& is) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-		Ch c = Take(is);
-		return c;
-	}
-
-	template <typename InputByteStream>
-	static Ch Take(InputByteStream& is) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-		return is.Take();
-	}
-
-	template <typename OutputByteStream>
-	static void PutBOM(OutputByteStream& os) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-		(void)os;
-	}
-
-	template <typename OutputByteStream>
-	static void Put(OutputByteStream& os, Ch c) {
-		RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-		os.Put(static_cast<typename OutputByteStream::Ch>(c));
-	}
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// AutoUTF
-
-//! Runtime-specified UTF encoding type of a stream.
-enum UTFType {
-	kUTF8 = 0,		//!< UTF-8.
-	kUTF16LE = 1,	//!< UTF-16 little endian.
-	kUTF16BE = 2,	//!< UTF-16 big endian.
-	kUTF32LE = 3,	//!< UTF-32 little endian.
-	kUTF32BE = 4	//!< UTF-32 big endian.
-};
-
-//! Dynamically select encoding according to stream's runtime-specified UTF encoding type.
-/*! \note This class can be used with AutoUTFInputtStream and AutoUTFOutputStream, which provides GetType().
-*/
-template<typename CharType>
-struct AutoUTF {
-	typedef CharType Ch;
-
-	enum { supportUnicode = 1 };
-
-#define RAPIDJSON_ENCODINGS_FUNC(x) UTF8<Ch>::x, UTF16LE<Ch>::x, UTF16BE<Ch>::x, UTF32LE<Ch>::x, UTF32BE<Ch>::x
-
-	template<typename OutputStream>
-	RAPIDJSON_FORCEINLINE static void Encode(OutputStream& os, unsigned codepoint) {
-		typedef void (*EncodeFunc)(OutputStream&, unsigned);
-		static const EncodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Encode) };
-		(*f[os.GetType()])(os, codepoint);
-	}
-
-	template <typename InputStream>
-	RAPIDJSON_FORCEINLINE static bool Decode(InputStream& is, unsigned* codepoint) {
-		typedef bool (*DecodeFunc)(InputStream&, unsigned*);
-		static const DecodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Decode) };
-		return (*f[is.GetType()])(is, codepoint);
-	}
-
-	template <typename InputStream, typename OutputStream>
-	RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
-		typedef bool (*ValidateFunc)(InputStream&, OutputStream&);
-		static const ValidateFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Validate) };
-		return (*f[is.GetType()])(is, os);
-	}
-
-#undef RAPIDJSON_ENCODINGS_FUNC
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Transcoder
-
-//! Encoding conversion.
-template<typename SourceEncoding, typename TargetEncoding>
-struct Transcoder {
-	//! Take one Unicode codepoint from source encoding, convert it to target encoding and put it to the output stream.
-	template<typename InputStream, typename OutputStream>
-	RAPIDJSON_FORCEINLINE static bool Transcode(InputStream& is, OutputStream& os) {
-		unsigned codepoint;
-		if (!SourceEncoding::Decode(is, &codepoint))
-			return false;
-		TargetEncoding::Encode(os, codepoint);
-		return true;
-	}
-
-	//! Validate one Unicode codepoint from an encoded stream.
-	template<typename InputStream, typename OutputStream>
-	RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
-		return Transcode(is, os);	// Since source/target encoding is different, must transcode.
-	}
-};
-
-//! Specialization of Transcoder with same source and target encoding.
-template<typename Encoding>
-struct Transcoder<Encoding, Encoding> {
-	template<typename InputStream, typename OutputStream>
-	RAPIDJSON_FORCEINLINE static bool Transcode(InputStream& is, OutputStream& os) {
-		os.Put(is.Take());	// Just copy one code unit. This semantic is different from primary template class.
-		return true;
-	}
-	
-	template<typename InputStream, typename OutputStream>
-	RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
-		return Encoding::Validate(is, os);	// source/target encoding are the same
-	}
-};
-
-} // namespace rapidjson
-
-#if defined(__GNUC__) || defined(_MSV_VER)
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_ENCODINGS_H_

common/rapidjson/rapidjson/error/en.h

@@ -1,52 +0,0 @@
-#ifndef RAPIDJSON_ERROR_EN_H__
-#define RAPIDJSON_ERROR_EN_H__
-
-#include "error.h"
-
-namespace rapidjson {
-
-//! Maps error code of parsing into error message.
-/*!
-	\param parseErrorCode Error code obtained in parsing.
-	\return the error message.
-	\note User can make a copy of this function for localization.
-		Using switch-case is safer for future modification of error codes.
-*/
-inline const RAPIDJSON_ERROR_CHARTYPE* GetParseError_En(ParseErrorCode parseErrorCode) {
-	switch (parseErrorCode) {
-		case kParseErrorNone:							return RAPIDJSON_ERROR_STRING("No error.");
-
-		case kParseErrorDocumentEmpty:					return RAPIDJSON_ERROR_STRING("The document is empty.");
-		case kParseErrorDocumentRootNotObjectOrArray:	return RAPIDJSON_ERROR_STRING("The document root must be either object or array.");
-		case kParseErrorDocumentRootNotSingular:		return RAPIDJSON_ERROR_STRING("The document root must not follow by other values.");
-	
-		case kParseErrorValueInvalid:					return RAPIDJSON_ERROR_STRING("Invalid value.");
-	
-		case kParseErrorObjectMissName:					return RAPIDJSON_ERROR_STRING("Missing a name for object member.");
-		case kParseErrorObjectMissColon:				return RAPIDJSON_ERROR_STRING("Missing a colon after a name of object member.");
-		case kParseErrorObjectMissCommaOrCurlyBracket:	return RAPIDJSON_ERROR_STRING("Missing a comma or '}' after an object member.");
-	
-		case kParseErrorArrayMissCommaOrSquareBracket:	return RAPIDJSON_ERROR_STRING("Missing a comma or ']' after an array element.");
-
-		case kParseErrorStringUnicodeEscapeInvalidHex:	return RAPIDJSON_ERROR_STRING("Incorrect hex digit after \\u escape in string.");
-		case kParseErrorStringUnicodeSurrogateInvalid:	return RAPIDJSON_ERROR_STRING("The surrogate pair in string is invalid.");
-		case kParseErrorStringEscapeInvalid:			return RAPIDJSON_ERROR_STRING("Invalid escape character in string.");
-		case kParseErrorStringMissQuotationMark:		return RAPIDJSON_ERROR_STRING("Missing a closing quotation mark in string.");
-		case kParseErrorStringInvalidEncoding:			return RAPIDJSON_ERROR_STRING("Invalid encoding in string.");
-
-		case kParseErrorNumberTooBig:					return RAPIDJSON_ERROR_STRING("Number too big to be stored in double.");
-		case kParseErrorNumberMissFraction:				return RAPIDJSON_ERROR_STRING("Miss fraction part in number.");
-		case kParseErrorNumberMissExponent:				return RAPIDJSON_ERROR_STRING("Miss exponent in number.");
-
-		case kParseErrorTermination:					return RAPIDJSON_ERROR_STRING("Terminate parsing due to Handler error.");
-		case kParseErrorUnspecificSyntaxError:			return RAPIDJSON_ERROR_STRING("Unspecific syntax error.");
-		case kParseErrorStackSizeLimitExceeded:			return RAPIDJSON_ERROR_STRING("Parsing stack size limit is exceeded.");
-
-		default:
-			return RAPIDJSON_ERROR_STRING("Unknown error.");
-	}
-}
-
-} // namespace rapidjson
-
-#endif // RAPIDJSON_ERROR_EN_H__

common/rapidjson/rapidjson/error/error.h

@@ -1,124 +0,0 @@
-#ifndef RAPIDJSON_ERROR_ERROR_H__
-#define RAPIDJSON_ERROR_ERROR_H__
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_ERROR_CHARTYPE
-
-//! Character type of error messages.
-/*! The default charater type is char.
-	On Windows, user can define this macro as TCHAR for supporting both
-	unicode/non-unicode settings.
-*/
-#ifndef RAPIDJSON_ERROR_CHARTYPE
-#define RAPIDJSON_ERROR_CHARTYPE char
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_ERROR_STRING
-
-//! Macro for converting string literial to RAPIDJSON_ERROR_CHARTYPE[].
-/*! By default this conversion macro does nothing.
-	On Windows, user can define this macro as _T(x) for supporting both 
-	unicode/non-unicode settings.
-*/
-#ifndef RAPIDJSON_ERROR_STRING
-#define RAPIDJSON_ERROR_STRING(x) x
-#endif
-
-namespace rapidjson {
-
-///////////////////////////////////////////////////////////////////////////////
-// ParseErrorCode
-
-//! Error code of parsing.
-/*! \see GenericReader::Parse, GenericReader::GetParseErrorCode
-*/
-enum ParseErrorCode {
-	kParseErrorNone = 0,						//!< No error.
-
-	kParseErrorDocumentEmpty,					//!< The document is empty.
-	kParseErrorDocumentRootNotObjectOrArray,	//!< The document root must be either object or array.
-	kParseErrorDocumentRootNotSingular,			//!< The document root must not follow by other values.
-
-	kParseErrorValueInvalid,					//!< Invalid value.
-
-	kParseErrorObjectMissName,					//!< Missing a name for object member.
-	kParseErrorObjectMissColon,					//!< Missing a colon after a name of object member.
-	kParseErrorObjectMissCommaOrCurlyBracket,	//!< Missing a comma or '}' after an object member.
-
-	kParseErrorArrayMissCommaOrSquareBracket,	//!< Missing a comma or ']' after an array element.
-
-	kParseErrorStringUnicodeEscapeInvalidHex,	//!< Incorrect hex digit after \\u escape in string.
-	kParseErrorStringUnicodeSurrogateInvalid,	//!< The surrogate pair in string is invalid.
-	kParseErrorStringEscapeInvalid,				//!< Invalid escape character in string.
-	kParseErrorStringMissQuotationMark,			//!< Missing a closing quotation mark in string.
-	kParseErrorStringInvalidEncoding,			//!< Invalid encoding in string.
-
-	kParseErrorNumberTooBig,					//!< Number too big to be stored in double.
-	kParseErrorNumberMissFraction,				//!< Miss fraction part in number.
-	kParseErrorNumberMissExponent,				//!< Miss exponent in number.
-
-	kParseErrorTermination,						//!< Parsing was terminated.
-	kParseErrorUnspecificSyntaxError,			//!< Unspecific syntax error.
-	kParseErrorStackSizeLimitExceeded			//!< Parsing stack size limit is exceeded.
-};
-
-//! Result of parsing (wraps ParseErrorCode)
-/*!
-	\code
-		Document doc;
-		ParseResult ok = doc.Parse("[42]");
-		if (!ok) {
-			fprintf(stderr, "JSON parse error: %s (%u)",
-					GetParseError_En(ok.Code()), ok.Offset());
-			exit(EXIT_FAILURE);
-		}
-	\endcode
-	\see GenericReader::Parse, GenericDocument::Parse
-*/
-struct ParseResult {
-
-	//! Default constructor, no error.
-	ParseResult() : code_(kParseErrorNone), offset_(0) {}
-	//! Constructor to set an error.
-	ParseResult(ParseErrorCode code, size_t offset) : code_(code), offset_(offset) {}
-
-	//! Get the error code.
-	ParseErrorCode Code() const { return code_; }
-	//! Get the error offset, if \ref IsError(), 0 otherwise.
-	size_t Offset() const { return offset_; }
-
-	//! Conversion to \c bool, returns \c true, iff !\ref IsError().
-	operator bool() const { return !IsError(); }
-	//! Whether the result is an error.
-	bool IsError() const { return code_ != kParseErrorNone; }
-
-	bool operator==(const ParseResult& that) const { return code_ == that.code_; }
-	bool operator==(ParseErrorCode code) const { return code_ == code; }
-	friend bool operator==(ParseErrorCode code, const ParseResult & err) { return code == err.code_; }
-
-	//! Reset error code.
-	void Clear() { Set(kParseErrorNone); }
-	//! Update error code and offset.
-	void Set(ParseErrorCode code, size_t offset = 0) { code_ = code; offset_ = offset; }
-
-private:
-	ParseErrorCode code_;
-	size_t offset_;
-};
-
-//! Function pointer type of GetParseError().
-/*! This is the prototype for GetParseError_X(), where X is a locale.
-	User can dynamically change locale in runtime, e.g.:
-
-\code
-	GetParseErrorFunc GetParseError = GetParseError_En; // or whatever
-	const RAPIDJSON_ERROR_CHARTYPE* s = GetParseError(document.GetParseErrorCode());
-\endcode
-*/
-
-typedef const RAPIDJSON_ERROR_CHARTYPE* (*GetParseErrorFunc)(ParseErrorCode);
-
-} // namespace rapidjson
-
-#endif // RAPIDJSON_ERROR_ERROR_H__

common/rapidjson/rapidjson/filereadstream.h

@@ -1,74 +0,0 @@
-#ifndef RAPIDJSON_FILEREADSTREAM_H_
-#define RAPIDJSON_FILEREADSTREAM_H_
-
-#include "rapidjson.h"
-#include <cstdio>
-
-namespace rapidjson {
-
-//! File byte stream for input using fread().
-/*!
-	\note implements Stream concept
-*/
-class FileReadStream {
-public:
-	typedef char Ch;	//!< Character type (byte).
-
-	//! Constructor.
-	/*!
-		\param fp File pointer opened for read.
-		\param buffer user-supplied buffer.
-		\param bufferSize size of buffer in bytes. Must >=4 bytes.
-	*/
-	FileReadStream(FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferSize_(bufferSize), bufferLast_(0), current_(buffer_), readCount_(0), count_(0), eof_(false) { 
-		RAPIDJSON_ASSERT(fp_ != 0);
-		RAPIDJSON_ASSERT(bufferSize >= 4);
-		Read();
-	}
-
-	Ch Peek() const { return *current_; }
-	Ch Take() { Ch c = *current_; Read(); return c; }
-	size_t Tell() const { return count_ + static_cast<size_t>(current_ - buffer_); }
-
-	// Not implemented
-	void Put(Ch) { RAPIDJSON_ASSERT(false); }
-	void Flush() { RAPIDJSON_ASSERT(false); } 
-	Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-	size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-	// For encoding detection only.
-	const Ch* Peek4() const {
-		return (current_ + 4 <= bufferLast_) ? current_ : 0;
-	}
-
-private:
-	void Read() {
-		if (current_ < bufferLast_)
-			++current_;
-		else if (!eof_) {
-			count_ += readCount_;
-			readCount_ = fread(buffer_, 1, bufferSize_, fp_);
-			bufferLast_ = buffer_ + readCount_ - 1;
-			current_ = buffer_;
-
-			if (readCount_ < bufferSize_) {
-				buffer_[readCount_] = '\0';
-				++bufferLast_;
-				eof_ = true;
-			}
-		}
-	}
-
-	FILE* fp_;
-	Ch *buffer_;
-	size_t bufferSize_;
-	Ch *bufferLast_;
-	Ch *current_;
-	size_t readCount_;
-	size_t count_;	//!< Number of characters read
-	bool eof_;
-};
-
-} // namespace rapidjson
-
-#endif // RAPIDJSON_FILESTREAM_H_

common/rapidjson/rapidjson/filestream.h

@@ -1,53 +0,0 @@
-#ifndef RAPIDJSON_FILESTREAM_H_
-#define RAPIDJSON_FILESTREAM_H_
-
-#include "rapidjson.h"
-#include <cstdio>
-
-namespace rapidjson {
-
-//! (Depreciated) Wrapper of C file stream for input or output.
-/*!
-	This simple wrapper does not check the validity of the stream.
-	\note implements Stream concept
-	\note deprecated: This was only for basic testing in version 0.1, it is found that the performance is very low by using fgetc(). Use FileReadStream instead.
-*/
-class FileStream {
-public:
-	typedef char Ch;	//!< Character type. Only support char.
-
-	FileStream(FILE* fp) : fp_(fp), current_('\0'), count_(0) { Read(); }
-	char Peek() const { return current_; }
-	char Take() { char c = current_; Read(); return c; }
-	size_t Tell() const { return count_; }
-	void Put(char c) { fputc(c, fp_); }
-	void Flush() { fflush(fp_); }
-
-	// Not implemented
-	char* PutBegin() { return 0; }
-	size_t PutEnd(char*) { return 0; }
-
-private:
-	// Prohibit copy constructor & assignment operator.
-	FileStream(const FileStream&);
-	FileStream& operator=(const FileStream&);
-
-	void Read() {
-		RAPIDJSON_ASSERT(fp_ != 0);
-		int c = fgetc(fp_);
-		if (c != EOF) {
-			current_ = (char)c;
-			count_++;
-		}
-		else if (current_ != '\0')
-			current_ = '\0';
-	}
-
-	FILE* fp_;
-	char current_;
-	size_t count_;
-};
-
-} // namespace rapidjson
-
-#endif // RAPIDJSON_FILESTREAM_H_

common/rapidjson/rapidjson/filewritestream.h

@@ -1,77 +0,0 @@
-#ifndef RAPIDJSON_FILEWRITESTREAM_H_
-#define RAPIDJSON_FILEWRITESTREAM_H_
-
-#include "rapidjson.h"
-#include <cstdio>
-
-namespace rapidjson {
-
-//! Wrapper of C file stream for input using fread().
-/*!
-	\note implements Stream concept
-*/
-class FileWriteStream {
-public:
-	typedef char Ch;	//!< Character type. Only support char.
-
-	FileWriteStream(FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferEnd_(buffer + bufferSize), current_(buffer_) { 
-		RAPIDJSON_ASSERT(fp_ != 0);
-	}
-
-	void Put(char c) { 
-		if (current_ >= bufferEnd_)
-			Flush();
-
-		*current_++ = c;
-	}
-
-	void PutN(char c, size_t n) {
-		size_t avail = static_cast<size_t>(bufferEnd_ - current_);
-		while (n > avail) {
-			memset(current_, c, avail);
-			current_ += avail;
-			Flush();
-			n -= avail;
-			avail = static_cast<size_t>(bufferEnd_ - current_);
-		}
-
-		if (n > 0) {
-			memset(current_, c, n);
-			current_ += n;
-		}
-	}
-
-	void Flush() {
-		if (current_ != buffer_) {
-			fwrite(buffer_, 1, static_cast<size_t>(current_ - buffer_), fp_);
-			current_ = buffer_;
-		}
-	}
-
-	// Not implemented
-	char Peek() const { RAPIDJSON_ASSERT(false); return 0; }
-	char Take() { RAPIDJSON_ASSERT(false); return 0; }
-	size_t Tell() const { RAPIDJSON_ASSERT(false); return 0; }
-	char* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-	size_t PutEnd(char*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-	// Prohibit copy constructor & assignment operator.
-	FileWriteStream(const FileWriteStream&);
-	FileWriteStream& operator=(const FileWriteStream&);
-
-	FILE* fp_;
-	char *buffer_;
-	char *bufferEnd_;
-	char *current_;
-};
-
-//! Implement specialized version of PutN() with memset() for better performance.
-template<>
-inline void PutN(FileWriteStream& stream, char c, size_t n) {
-	stream.PutN(c, n);
-}
-
-} // namespace rapidjson
-
-#endif // RAPIDJSON_FILESTREAM_H_

common/rapidjson/rapidjson/internal/meta.h

@@ -1,77 +0,0 @@
-#ifndef RAPIDJSON_INTERNAL_META_H_
-#define RAPIDJSON_INTERNAL_META_H_
-
-//@cond RAPIDJSON_INTERNAL
-namespace rapidjson {
-namespace internal {
-
-template <int N> struct IntegralC { enum { Value = N }; };
-template <bool Cond> struct BoolType : IntegralC<Cond> {};
-struct TrueType : BoolType<true> {};
-struct FalseType : BoolType<false> {};
-
-template <typename T> struct AddConst { typedef const T Type; };
-template <typename T> struct RemoveConst { typedef T Type; };
-template <typename T> struct RemoveConst<const T> { typedef T Type; };
-
-template <bool Condition, typename T1, typename T2> struct SelectIfCond;
-template <typename T1, typename T2> struct SelectIfCond<true,T1,T2> { typedef T1 Type; };
-template <typename T1, typename T2> struct SelectIfCond<false,T1,T2> { typedef T2 Type; };
-
-template <typename Condition, typename T1, typename T2>
-struct SelectIf : SelectIfCond<Condition::Value,T1,T2> {};
-
-template <bool Constify, typename T>
-struct MaybeAddConst : SelectIfCond<Constify, const T, T> {};
-
-template <typename T, typename U> struct IsSame  : FalseType {};
-template <typename T> struct IsSame<T,T>  : TrueType {};
-
-template <typename T> struct IsConst : FalseType {};
-template <typename T> struct IsConst<const T> : TrueType {};
-
-template <typename T> struct IsPointer : FalseType {};
-template <typename T> struct IsPointer<T*> : TrueType {};
-
-template <typename CT, typename T>
-struct IsMoreConst {
-	enum { Value =
-		( IsSame< typename RemoveConst<CT>::Type, typename RemoveConst<T>::Type>::Value
-		&& ( IsConst<CT>::Value >= IsConst<T>::Value ) )
-	};
-};
-
-template <bool Condition, typename T = void> struct EnableIfCond;
-template <typename T> struct EnableIfCond<true, T> { typedef T Type; };
-template <typename T> struct EnableIfCond<false, T> { /* empty */ };
-
-template <bool Condition, typename T = void>
-struct DisableIfCond : EnableIfCond<!Condition, T> {};
-
-template <typename Condition, typename T = void>
-struct EnableIf : EnableIfCond<Condition::Value, T> {};
-
-template <typename Condition, typename T = void>
-struct DisableIf : DisableIfCond<Condition::Value, T> {};
-
-// SFINAE helpers
-struct SfinaeResultTag {};
-template <typename T> struct RemoveSfinaeFptr {};
-template <typename T> struct RemoveSfinaeFptr<SfinaeResultTag&(*)(T)> { typedef T Type; };
-
-#define RAPIDJSON_REMOVEFPTR_(type) \
-	typename ::rapidjson::internal::RemoveSfinaeFptr \
-		< ::rapidjson::internal::SfinaeResultTag&(*) type>::Type
-
-#define RAPIDJSON_ENABLEIF(cond) \
-	typename ::rapidjson::internal::EnableIf \
-		<RAPIDJSON_REMOVEFPTR_(cond)>::Type * = NULL
-
-#define RAPIDJSON_DISABLEIF_RETURN(cond,returntype) \
-	typename ::rapidjson::internal::DisableIf<cond,returntype>::Type
-
-} // namespace internal
-} // namespace rapidjson
-//@endcond
-
-#endif // RAPIDJSON_INTERNAL_META_H_

common/rapidjson/rapidjson/internal/pow10.h

@@ -1,54 +0,0 @@
-#ifndef RAPIDJSON_POW10_
-#define RAPIDJSON_POW10_
-
-namespace rapidjson {
-namespace internal {
-
-//! Computes integer powers of 10 in double (10.0^n).
-/*! This function uses lookup table for fast and accurate results.
-	\param n positive/negative exponent. Must <= 308.
-	\return 10.0^n
-*/
-inline double Pow10(int n) {
-	static const double e[] = { // 1e-308...1e308: 617 * 8 bytes = 4936 bytes
-		1e-308,1e-307,1e-306,1e-305,1e-304,1e-303,1e-302,1e-301,1e-300,
-		1e-299,1e-298,1e-297,1e-296,1e-295,1e-294,1e-293,1e-292,1e-291,1e-290,1e-289,1e-288,1e-287,1e-286,1e-285,1e-284,1e-283,1e-282,1e-281,1e-280,
-		1e-279,1e-278,1e-277,1e-276,1e-275,1e-274,1e-273,1e-272,1e-271,1e-270,1e-269,1e-268,1e-267,1e-266,1e-265,1e-264,1e-263,1e-262,1e-261,1e-260,
-		1e-259,1e-258,1e-257,1e-256,1e-255,1e-254,1e-253,1e-252,1e-251,1e-250,1e-249,1e-248,1e-247,1e-246,1e-245,1e-244,1e-243,1e-242,1e-241,1e-240,
-		1e-239,1e-238,1e-237,1e-236,1e-235,1e-234,1e-233,1e-232,1e-231,1e-230,1e-229,1e-228,1e-227,1e-226,1e-225,1e-224,1e-223,1e-222,1e-221,1e-220,
-		1e-219,1e-218,1e-217,1e-216,1e-215,1e-214,1e-213,1e-212,1e-211,1e-210,1e-209,1e-208,1e-207,1e-206,1e-205,1e-204,1e-203,1e-202,1e-201,1e-200,
-		1e-199,1e-198,1e-197,1e-196,1e-195,1e-194,1e-193,1e-192,1e-191,1e-190,1e-189,1e-188,1e-187,1e-186,1e-185,1e-184,1e-183,1e-182,1e-181,1e-180,
-		1e-179,1e-178,1e-177,1e-176,1e-175,1e-174,1e-173,1e-172,1e-171,1e-170,1e-169,1e-168,1e-167,1e-166,1e-165,1e-164,1e-163,1e-162,1e-161,1e-160,
-		1e-159,1e-158,1e-157,1e-156,1e-155,1e-154,1e-153,1e-152,1e-151,1e-150,1e-149,1e-148,1e-147,1e-146,1e-145,1e-144,1e-143,1e-142,1e-141,1e-140,
-		1e-139,1e-138,1e-137,1e-136,1e-135,1e-134,1e-133,1e-132,1e-131,1e-130,1e-129,1e-128,1e-127,1e-126,1e-125,1e-124,1e-123,1e-122,1e-121,1e-120,
-		1e-119,1e-118,1e-117,1e-116,1e-115,1e-114,1e-113,1e-112,1e-111,1e-110,1e-109,1e-108,1e-107,1e-106,1e-105,1e-104,1e-103,1e-102,1e-101,1e-100,
-		1e-99, 1e-98, 1e-97, 1e-96, 1e-95, 1e-94, 1e-93, 1e-92, 1e-91, 1e-90, 1e-89, 1e-88, 1e-87, 1e-86, 1e-85, 1e-84, 1e-83, 1e-82, 1e-81, 1e-80, 
-		1e-79, 1e-78, 1e-77, 1e-76, 1e-75, 1e-74, 1e-73, 1e-72, 1e-71, 1e-70, 1e-69, 1e-68, 1e-67, 1e-66, 1e-65, 1e-64, 1e-63, 1e-62, 1e-61, 1e-60, 
-		1e-59, 1e-58, 1e-57, 1e-56, 1e-55, 1e-54, 1e-53, 1e-52, 1e-51, 1e-50, 1e-49, 1e-48, 1e-47, 1e-46, 1e-45, 1e-44, 1e-43, 1e-42, 1e-41, 1e-40, 
-		1e-39, 1e-38, 1e-37, 1e-36, 1e-35, 1e-34, 1e-33, 1e-32, 1e-31, 1e-30, 1e-29, 1e-28, 1e-27, 1e-26, 1e-25, 1e-24, 1e-23, 1e-22, 1e-21, 1e-20, 
-		1e-19, 1e-18, 1e-17, 1e-16, 1e-15, 1e-14, 1e-13, 1e-12, 1e-11, 1e-10, 1e-9,  1e-8,  1e-7,  1e-6,  1e-5,  1e-4,  1e-3,  1e-2,  1e-1,  1e+0,  
-		1e+1,  1e+2,  1e+3,  1e+4,  1e+5,  1e+6,  1e+7,  1e+8,  1e+9,  1e+10, 1e+11, 1e+12, 1e+13, 1e+14, 1e+15, 1e+16, 1e+17, 1e+18, 1e+19, 1e+20, 
-		1e+21, 1e+22, 1e+23, 1e+24, 1e+25, 1e+26, 1e+27, 1e+28, 1e+29, 1e+30, 1e+31, 1e+32, 1e+33, 1e+34, 1e+35, 1e+36, 1e+37, 1e+38, 1e+39, 1e+40,
-		1e+41, 1e+42, 1e+43, 1e+44, 1e+45, 1e+46, 1e+47, 1e+48, 1e+49, 1e+50, 1e+51, 1e+52, 1e+53, 1e+54, 1e+55, 1e+56, 1e+57, 1e+58, 1e+59, 1e+60,
-		1e+61, 1e+62, 1e+63, 1e+64, 1e+65, 1e+66, 1e+67, 1e+68, 1e+69, 1e+70, 1e+71, 1e+72, 1e+73, 1e+74, 1e+75, 1e+76, 1e+77, 1e+78, 1e+79, 1e+80,
-		1e+81, 1e+82, 1e+83, 1e+84, 1e+85, 1e+86, 1e+87, 1e+88, 1e+89, 1e+90, 1e+91, 1e+92, 1e+93, 1e+94, 1e+95, 1e+96, 1e+97, 1e+98, 1e+99, 1e+100,
-		1e+101,1e+102,1e+103,1e+104,1e+105,1e+106,1e+107,1e+108,1e+109,1e+110,1e+111,1e+112,1e+113,1e+114,1e+115,1e+116,1e+117,1e+118,1e+119,1e+120,
-		1e+121,1e+122,1e+123,1e+124,1e+125,1e+126,1e+127,1e+128,1e+129,1e+130,1e+131,1e+132,1e+133,1e+134,1e+135,1e+136,1e+137,1e+138,1e+139,1e+140,
-		1e+141,1e+142,1e+143,1e+144,1e+145,1e+146,1e+147,1e+148,1e+149,1e+150,1e+151,1e+152,1e+153,1e+154,1e+155,1e+156,1e+157,1e+158,1e+159,1e+160,
-		1e+161,1e+162,1e+163,1e+164,1e+165,1e+166,1e+167,1e+168,1e+169,1e+170,1e+171,1e+172,1e+173,1e+174,1e+175,1e+176,1e+177,1e+178,1e+179,1e+180,
-		1e+181,1e+182,1e+183,1e+184,1e+185,1e+186,1e+187,1e+188,1e+189,1e+190,1e+191,1e+192,1e+193,1e+194,1e+195,1e+196,1e+197,1e+198,1e+199,1e+200,
-		1e+201,1e+202,1e+203,1e+204,1e+205,1e+206,1e+207,1e+208,1e+209,1e+210,1e+211,1e+212,1e+213,1e+214,1e+215,1e+216,1e+217,1e+218,1e+219,1e+220,
-		1e+221,1e+222,1e+223,1e+224,1e+225,1e+226,1e+227,1e+228,1e+229,1e+230,1e+231,1e+232,1e+233,1e+234,1e+235,1e+236,1e+237,1e+238,1e+239,1e+240,
-		1e+241,1e+242,1e+243,1e+244,1e+245,1e+246,1e+247,1e+248,1e+249,1e+250,1e+251,1e+252,1e+253,1e+254,1e+255,1e+256,1e+257,1e+258,1e+259,1e+260,
-		1e+261,1e+262,1e+263,1e+264,1e+265,1e+266,1e+267,1e+268,1e+269,1e+270,1e+271,1e+272,1e+273,1e+274,1e+275,1e+276,1e+277,1e+278,1e+279,1e+280,
-		1e+281,1e+282,1e+283,1e+284,1e+285,1e+286,1e+287,1e+288,1e+289,1e+290,1e+291,1e+292,1e+293,1e+294,1e+295,1e+296,1e+297,1e+298,1e+299,1e+300,
-		1e+301,1e+302,1e+303,1e+304,1e+305,1e+306,1e+307,1e+308
-	};
-	RAPIDJSON_ASSERT(n <= 308);
-	return n < -308 ? 0.0 : e[n + 308];
-}
-
-} // namespace internal
-} // namespace rapidjson
-
-#endif // RAPIDJSON_POW10_

common/rapidjson/rapidjson/internal/stack.h

@@ -1,87 +0,0 @@
-#ifndef RAPIDJSON_INTERNAL_STACK_H_
-#define RAPIDJSON_INTERNAL_STACK_H_
-
-namespace rapidjson {
-namespace internal {
-
-///////////////////////////////////////////////////////////////////////////////
-// Stack
-
-//! A type-unsafe stack for storing different types of data.
-/*! \tparam Allocator Allocator for allocating stack memory.
-*/
-template <typename Allocator>
-class Stack {
-public:
-	Stack(Allocator* allocator, size_t stack_capacity) : allocator_(allocator), own_allocator_(0), stack_(0), stack_top_(0), stack_end_(0), stack_capacity_(stack_capacity) {
-		RAPIDJSON_ASSERT(stack_capacity_ > 0);
-		if (!allocator_)
-			own_allocator_ = allocator_ = new Allocator();
-		stack_top_ = stack_ = (char*)allocator_->Malloc(stack_capacity_);
-		stack_end_ = stack_ + stack_capacity_;
-	}
-
-	~Stack() {
-		Allocator::Free(stack_);
-		delete own_allocator_; // Only delete if it is owned by the stack
-	}
-
-	void Clear() { /*stack_top_ = 0;*/ stack_top_ = stack_; }
-
-	template<typename T>
-	T* Push(size_t count = 1) {
-		 // Expand the stack if needed
-		if (stack_top_ + sizeof(T) * count >= stack_end_) {
-			size_t new_capacity = stack_capacity_ * 2;
-			size_t size = GetSize();
-			size_t new_size = GetSize() + sizeof(T) * count;
-			if (new_capacity < new_size)
-				new_capacity = new_size;
-			stack_ = (char*)allocator_->Realloc(stack_, stack_capacity_, new_capacity);
-			stack_capacity_ = new_capacity;
-			stack_top_ = stack_ + size;
-			stack_end_ = stack_ + stack_capacity_;
-		}
-		T* ret = reinterpret_cast<T*>(stack_top_);
-		stack_top_ += sizeof(T) * count;
-		return ret;
-	}
-
-	template<typename T>
-	T* Pop(size_t count) {
-		RAPIDJSON_ASSERT(GetSize() >= count * sizeof(T));
-		stack_top_ -= count * sizeof(T);
-		return reinterpret_cast<T*>(stack_top_);
-	}
-
-	template<typename T>
-	T* Top() { 
-		RAPIDJSON_ASSERT(GetSize() >= sizeof(T));
-		return reinterpret_cast<T*>(stack_top_ - sizeof(T));
-	}
-
-	template<typename T>
-	T* Bottom() { return (T*)stack_; }
-
-	Allocator& GetAllocator() { return *allocator_; }
-	bool Empty() const { return stack_top_ == stack_; }
-	size_t GetSize() const { return static_cast<size_t>(stack_top_ - stack_); }
-	size_t GetCapacity() const { return stack_capacity_; }
-
-private:
-	// Prohibit copy constructor & assignment operator.
-	Stack(const Stack&);
-	Stack& operator=(const Stack&);
-
-	Allocator* allocator_;
-	Allocator* own_allocator_;
-	char *stack_;
-	char *stack_top_;
-	char *stack_end_;
-	size_t stack_capacity_;
-};
-
-} // namespace internal
-} // namespace rapidjson
-
-#endif // RAPIDJSON_STACK_H_

common/rapidjson/rapidjson/internal/strfunc.h

@@ -1,23 +0,0 @@
-#ifndef RAPIDJSON_INTERNAL_STRFUNC_H_
-#define RAPIDJSON_INTERNAL_STRFUNC_H_
-
-namespace rapidjson {
-namespace internal {
-
-//! Custom strlen() which works on different character types.
-/*!	\tparam Ch Character type (e.g. char, wchar_t, short)
-	\param s Null-terminated input string.
-	\return Number of characters in the string. 
-	\note This has the same semantics as strlen(), the return value is not number of Unicode codepoints.
-*/
-template <typename Ch>
-inline SizeType StrLen(const Ch* s) {
-	const Ch* p = s;
-	while (*p) ++p;
-	return SizeType(p - s);
-}
-
-} // namespace internal
-} // namespace rapidjson
-
-#endif // RAPIDJSON_INTERNAL_STRFUNC_H_

common/rapidjson/rapidjson/msinttypes/inttypes.h

@@ -1,306 +0,0 @@
-// ISO C9x  compliant inttypes.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
-// 
-//  Copyright (c) 2006-2013 Alexander Chemeris
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-// 
-//   1. Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-// 
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-// 
-//   3. Neither the name of the product nor the names of its contributors may
-//      be used to endorse or promote products derived from this software
-//      without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_INTTYPES_H_ // [
-#define _MSC_INTTYPES_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#include "stdint.h"
-
-// 7.8 Format conversion of integer types
-
-typedef struct {
-   intmax_t quot;
-   intmax_t rem;
-} imaxdiv_t;
-
-// 7.8.1 Macros for format specifiers
-
-#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [   See footnote 185 at page 198
-
-// The fprintf macros for signed integers are:
-#define PRId8       "d"
-#define PRIi8       "i"
-#define PRIdLEAST8  "d"
-#define PRIiLEAST8  "i"
-#define PRIdFAST8   "d"
-#define PRIiFAST8   "i"
-
-#define PRId16       "hd"
-#define PRIi16       "hi"
-#define PRIdLEAST16  "hd"
-#define PRIiLEAST16  "hi"
-#define PRIdFAST16   "hd"
-#define PRIiFAST16   "hi"
-
-#define PRId32       "I32d"
-#define PRIi32       "I32i"
-#define PRIdLEAST32  "I32d"
-#define PRIiLEAST32  "I32i"
-#define PRIdFAST32   "I32d"
-#define PRIiFAST32   "I32i"
-
-#define PRId64       "I64d"
-#define PRIi64       "I64i"
-#define PRIdLEAST64  "I64d"
-#define PRIiLEAST64  "I64i"
-#define PRIdFAST64   "I64d"
-#define PRIiFAST64   "I64i"
-
-#define PRIdMAX     "I64d"
-#define PRIiMAX     "I64i"
-
-#define PRIdPTR     "Id"
-#define PRIiPTR     "Ii"
-
-// The fprintf macros for unsigned integers are:
-#define PRIo8       "o"
-#define PRIu8       "u"
-#define PRIx8       "x"
-#define PRIX8       "X"
-#define PRIoLEAST8  "o"
-#define PRIuLEAST8  "u"
-#define PRIxLEAST8  "x"
-#define PRIXLEAST8  "X"
-#define PRIoFAST8   "o"
-#define PRIuFAST8   "u"
-#define PRIxFAST8   "x"
-#define PRIXFAST8   "X"
-
-#define PRIo16       "ho"
-#define PRIu16       "hu"
-#define PRIx16       "hx"
-#define PRIX16       "hX"
-#define PRIoLEAST16  "ho"
-#define PRIuLEAST16  "hu"
-#define PRIxLEAST16  "hx"
-#define PRIXLEAST16  "hX"
-#define PRIoFAST16   "ho"
-#define PRIuFAST16   "hu"
-#define PRIxFAST16   "hx"
-#define PRIXFAST16   "hX"
-
-#define PRIo32       "I32o"
-#define PRIu32       "I32u"
-#define PRIx32       "I32x"
-#define PRIX32       "I32X"
-#define PRIoLEAST32  "I32o"
-#define PRIuLEAST32  "I32u"
-#define PRIxLEAST32  "I32x"
-#define PRIXLEAST32  "I32X"
-#define PRIoFAST32   "I32o"
-#define PRIuFAST32   "I32u"
-#define PRIxFAST32   "I32x"
-#define PRIXFAST32   "I32X"
-
-#define PRIo64       "I64o"
-#define PRIu64       "I64u"
-#define PRIx64       "I64x"
-#define PRIX64       "I64X"
-#define PRIoLEAST64  "I64o"
-#define PRIuLEAST64  "I64u"
-#define PRIxLEAST64  "I64x"
-#define PRIXLEAST64  "I64X"
-#define PRIoFAST64   "I64o"
-#define PRIuFAST64   "I64u"
-#define PRIxFAST64   "I64x"
-#define PRIXFAST64   "I64X"
-
-#define PRIoMAX     "I64o"
-#define PRIuMAX     "I64u"
-#define PRIxMAX     "I64x"
-#define PRIXMAX     "I64X"
-
-#define PRIoPTR     "Io"
-#define PRIuPTR     "Iu"
-#define PRIxPTR     "Ix"
-#define PRIXPTR     "IX"
-
-// The fscanf macros for signed integers are:
-#define SCNd8       "d"
-#define SCNi8       "i"
-#define SCNdLEAST8  "d"
-#define SCNiLEAST8  "i"
-#define SCNdFAST8   "d"
-#define SCNiFAST8   "i"
-
-#define SCNd16       "hd"
-#define SCNi16       "hi"
-#define SCNdLEAST16  "hd"
-#define SCNiLEAST16  "hi"
-#define SCNdFAST16   "hd"
-#define SCNiFAST16   "hi"
-
-#define SCNd32       "ld"
-#define SCNi32       "li"
-#define SCNdLEAST32  "ld"
-#define SCNiLEAST32  "li"
-#define SCNdFAST32   "ld"
-#define SCNiFAST32   "li"
-
-#define SCNd64       "I64d"
-#define SCNi64       "I64i"
-#define SCNdLEAST64  "I64d"
-#define SCNiLEAST64  "I64i"
-#define SCNdFAST64   "I64d"
-#define SCNiFAST64   "I64i"
-
-#define SCNdMAX     "I64d"
-#define SCNiMAX     "I64i"
-
-#ifdef _WIN64 // [
-#  define SCNdPTR     "I64d"
-#  define SCNiPTR     "I64i"
-#else  // _WIN64 ][
-#  define SCNdPTR     "ld"
-#  define SCNiPTR     "li"
-#endif  // _WIN64 ]
-
-// The fscanf macros for unsigned integers are:
-#define SCNo8       "o"
-#define SCNu8       "u"
-#define SCNx8       "x"
-#define SCNX8       "X"
-#define SCNoLEAST8  "o"
-#define SCNuLEAST8  "u"
-#define SCNxLEAST8  "x"
-#define SCNXLEAST8  "X"
-#define SCNoFAST8   "o"
-#define SCNuFAST8   "u"
-#define SCNxFAST8   "x"
-#define SCNXFAST8   "X"
-
-#define SCNo16       "ho"
-#define SCNu16       "hu"
-#define SCNx16       "hx"
-#define SCNX16       "hX"
-#define SCNoLEAST16  "ho"
-#define SCNuLEAST16  "hu"
-#define SCNxLEAST16  "hx"
-#define SCNXLEAST16  "hX"
-#define SCNoFAST16   "ho"
-#define SCNuFAST16   "hu"
-#define SCNxFAST16   "hx"
-#define SCNXFAST16   "hX"
-
-#define SCNo32       "lo"
-#define SCNu32       "lu"
-#define SCNx32       "lx"
-#define SCNX32       "lX"
-#define SCNoLEAST32  "lo"
-#define SCNuLEAST32  "lu"
-#define SCNxLEAST32  "lx"
-#define SCNXLEAST32  "lX"
-#define SCNoFAST32   "lo"
-#define SCNuFAST32   "lu"
-#define SCNxFAST32   "lx"
-#define SCNXFAST32   "lX"
-
-#define SCNo64       "I64o"
-#define SCNu64       "I64u"
-#define SCNx64       "I64x"
-#define SCNX64       "I64X"
-#define SCNoLEAST64  "I64o"
-#define SCNuLEAST64  "I64u"
-#define SCNxLEAST64  "I64x"
-#define SCNXLEAST64  "I64X"
-#define SCNoFAST64   "I64o"
-#define SCNuFAST64   "I64u"
-#define SCNxFAST64   "I64x"
-#define SCNXFAST64   "I64X"
-
-#define SCNoMAX     "I64o"
-#define SCNuMAX     "I64u"
-#define SCNxMAX     "I64x"
-#define SCNXMAX     "I64X"
-
-#ifdef _WIN64 // [
-#  define SCNoPTR     "I64o"
-#  define SCNuPTR     "I64u"
-#  define SCNxPTR     "I64x"
-#  define SCNXPTR     "I64X"
-#else  // _WIN64 ][
-#  define SCNoPTR     "lo"
-#  define SCNuPTR     "lu"
-#  define SCNxPTR     "lx"
-#  define SCNXPTR     "lX"
-#endif  // _WIN64 ]
-
-#endif // __STDC_FORMAT_MACROS ]
-
-// 7.8.2 Functions for greatest-width integer types
-
-// 7.8.2.1 The imaxabs function
-#define imaxabs _abs64
-
-// 7.8.2.2 The imaxdiv function
-
-// This is modified version of div() function from Microsoft's div.c found
-// in %MSVC.NET%\crt\src\div.c
-#ifdef STATIC_IMAXDIV // [
-static
-#else // STATIC_IMAXDIV ][
-_inline
-#endif // STATIC_IMAXDIV ]
-imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
-{
-   imaxdiv_t result;
-
-   result.quot = numer / denom;
-   result.rem = numer % denom;
-
-   if (numer < 0 && result.rem > 0) {
-      // did division wrong; must fix up
-      ++result.quot;
-      result.rem -= denom;
-   }
-
-   return result;
-}
-
-// 7.8.2.3 The strtoimax and strtoumax functions
-#define strtoimax _strtoi64
-#define strtoumax _strtoui64
-
-// 7.8.2.4 The wcstoimax and wcstoumax functions
-#define wcstoimax _wcstoi64
-#define wcstoumax _wcstoui64
-
-
-#endif // _MSC_INTTYPES_H_ ]

common/rapidjson/rapidjson/msinttypes/stdint.h

@@ -1,260 +0,0 @@
-// ISO C9x  compliant stdint.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
-// 
-//  Copyright (c) 2006-2013 Alexander Chemeris
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-// 
-//   1. Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-// 
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-// 
-//   3. Neither the name of the product nor the names of its contributors may
-//      be used to endorse or promote products derived from this software
-//      without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_STDINT_H_ // [
-#define _MSC_STDINT_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-// miloyip: Originally Visual Studio 2010 uses its own stdint.h. However it generates warning with INT64_C(), so change to use this file for vs2010.
-#if _MSC_VER >= 1700 // [
-#include <stdint.h>
-#else // ] _MSC_VER >= 1700 [
-
-#include <limits.h>
-
-// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
-// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
-// or compiler give many errors like this:
-//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
-#ifdef __cplusplus
-extern "C" {
-#endif
-#  include <wchar.h>
-#ifdef __cplusplus
-}
-#endif
-
-// Define _W64 macros to mark types changing their size, like intptr_t.
-#ifndef _W64
-#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
-#     define _W64 __w64
-#  else
-#     define _W64
-#  endif
-#endif
-
-
-// 7.18.1 Integer types
-
-// 7.18.1.1 Exact-width integer types
-
-// Visual Studio 6 and Embedded Visual C++ 4 doesn't
-// realize that, e.g. char has the same size as __int8
-// so we give up on __intX for them.
-#if (_MSC_VER < 1300)
-   typedef signed char       int8_t;
-   typedef signed short      int16_t;
-   typedef signed int        int32_t;
-   typedef unsigned char     uint8_t;
-   typedef unsigned short    uint16_t;
-   typedef unsigned int      uint32_t;
-#else
-   typedef signed __int8     int8_t;
-   typedef signed __int16    int16_t;
-   typedef signed __int32    int32_t;
-   typedef unsigned __int8   uint8_t;
-   typedef unsigned __int16  uint16_t;
-   typedef unsigned __int32  uint32_t;
-#endif
-typedef signed __int64       int64_t;
-typedef unsigned __int64     uint64_t;
-
-
-// 7.18.1.2 Minimum-width integer types
-typedef int8_t    int_least8_t;
-typedef int16_t   int_least16_t;
-typedef int32_t   int_least32_t;
-typedef int64_t   int_least64_t;
-typedef uint8_t   uint_least8_t;
-typedef uint16_t  uint_least16_t;
-typedef uint32_t  uint_least32_t;
-typedef uint64_t  uint_least64_t;
-
-// 7.18.1.3 Fastest minimum-width integer types
-typedef int8_t    int_fast8_t;
-typedef int16_t   int_fast16_t;
-typedef int32_t   int_fast32_t;
-typedef int64_t   int_fast64_t;
-typedef uint8_t   uint_fast8_t;
-typedef uint16_t  uint_fast16_t;
-typedef uint32_t  uint_fast32_t;
-typedef uint64_t  uint_fast64_t;
-
-// 7.18.1.4 Integer types capable of holding object pointers
-#ifdef _WIN64 // [
-   typedef signed __int64    intptr_t;
-   typedef unsigned __int64  uintptr_t;
-#else // _WIN64 ][
-   typedef _W64 signed int   intptr_t;
-   typedef _W64 unsigned int uintptr_t;
-#endif // _WIN64 ]
-
-// 7.18.1.5 Greatest-width integer types
-typedef int64_t   intmax_t;
-typedef uint64_t  uintmax_t;
-
-
-// 7.18.2 Limits of specified-width integer types
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
-
-// 7.18.2.1 Limits of exact-width integer types
-#define INT8_MIN     ((int8_t)_I8_MIN)
-#define INT8_MAX     _I8_MAX
-#define INT16_MIN    ((int16_t)_I16_MIN)
-#define INT16_MAX    _I16_MAX
-#define INT32_MIN    ((int32_t)_I32_MIN)
-#define INT32_MAX    _I32_MAX
-#define INT64_MIN    ((int64_t)_I64_MIN)
-#define INT64_MAX    _I64_MAX
-#define UINT8_MAX    _UI8_MAX
-#define UINT16_MAX   _UI16_MAX
-#define UINT32_MAX   _UI32_MAX
-#define UINT64_MAX   _UI64_MAX
-
-// 7.18.2.2 Limits of minimum-width integer types
-#define INT_LEAST8_MIN    INT8_MIN
-#define INT_LEAST8_MAX    INT8_MAX
-#define INT_LEAST16_MIN   INT16_MIN
-#define INT_LEAST16_MAX   INT16_MAX
-#define INT_LEAST32_MIN   INT32_MIN
-#define INT_LEAST32_MAX   INT32_MAX
-#define INT_LEAST64_MIN   INT64_MIN
-#define INT_LEAST64_MAX   INT64_MAX
-#define UINT_LEAST8_MAX   UINT8_MAX
-#define UINT_LEAST16_MAX  UINT16_MAX
-#define UINT_LEAST32_MAX  UINT32_MAX
-#define UINT_LEAST64_MAX  UINT64_MAX
-
-// 7.18.2.3 Limits of fastest minimum-width integer types
-#define INT_FAST8_MIN    INT8_MIN
-#define INT_FAST8_MAX    INT8_MAX
-#define INT_FAST16_MIN   INT16_MIN
-#define INT_FAST16_MAX   INT16_MAX
-#define INT_FAST32_MIN   INT32_MIN
-#define INT_FAST32_MAX   INT32_MAX
-#define INT_FAST64_MIN   INT64_MIN
-#define INT_FAST64_MAX   INT64_MAX
-#define UINT_FAST8_MAX   UINT8_MAX
-#define UINT_FAST16_MAX  UINT16_MAX
-#define UINT_FAST32_MAX  UINT32_MAX
-#define UINT_FAST64_MAX  UINT64_MAX
-
-// 7.18.2.4 Limits of integer types capable of holding object pointers
-#ifdef _WIN64 // [
-#  define INTPTR_MIN   INT64_MIN
-#  define INTPTR_MAX   INT64_MAX
-#  define UINTPTR_MAX  UINT64_MAX
-#else // _WIN64 ][
-#  define INTPTR_MIN   INT32_MIN
-#  define INTPTR_MAX   INT32_MAX
-#  define UINTPTR_MAX  UINT32_MAX
-#endif // _WIN64 ]
-
-// 7.18.2.5 Limits of greatest-width integer types
-#define INTMAX_MIN   INT64_MIN
-#define INTMAX_MAX   INT64_MAX
-#define UINTMAX_MAX  UINT64_MAX
-
-// 7.18.3 Limits of other integer types
-
-#ifdef _WIN64 // [
-#  define PTRDIFF_MIN  _I64_MIN
-#  define PTRDIFF_MAX  _I64_MAX
-#else  // _WIN64 ][
-#  define PTRDIFF_MIN  _I32_MIN
-#  define PTRDIFF_MAX  _I32_MAX
-#endif  // _WIN64 ]
-
-#define SIG_ATOMIC_MIN  INT_MIN
-#define SIG_ATOMIC_MAX  INT_MAX
-
-#ifndef SIZE_MAX // [
-#  ifdef _WIN64 // [
-#     define SIZE_MAX  _UI64_MAX
-#  else // _WIN64 ][
-#     define SIZE_MAX  _UI32_MAX
-#  endif // _WIN64 ]
-#endif // SIZE_MAX ]
-
-// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
-#ifndef WCHAR_MIN // [
-#  define WCHAR_MIN  0
-#endif  // WCHAR_MIN ]
-#ifndef WCHAR_MAX // [
-#  define WCHAR_MAX  _UI16_MAX
-#endif  // WCHAR_MAX ]
-
-#define WINT_MIN  0
-#define WINT_MAX  _UI16_MAX
-
-#endif // __STDC_LIMIT_MACROS ]
-
-
-// 7.18.4 Limits of other integer types
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
-
-// 7.18.4.1 Macros for minimum-width integer constants
-
-#define INT8_C(val)  val##i8
-#define INT16_C(val) val##i16
-#define INT32_C(val) val##i32
-#define INT64_C(val) val##i64
-
-#define UINT8_C(val)  val##ui8
-#define UINT16_C(val) val##ui16
-#define UINT32_C(val) val##ui32
-#define UINT64_C(val) val##ui64
-
-// 7.18.4.2 Macros for greatest-width integer constants
-// These #ifndef's are needed to prevent collisions with <boost/cstdint.hpp>.
-// Check out Issue 9 for the details.
-#ifndef INTMAX_C //   [
-#  define INTMAX_C   INT64_C
-#endif // INTMAX_C    ]
-#ifndef UINTMAX_C //  [
-#  define UINTMAX_C  UINT64_C
-#endif // UINTMAX_C   ]
-
-#endif // __STDC_CONSTANT_MACROS ]
-
-#endif // _MSC_VER >= 1600 ]
-
-#endif // _MSC_STDINT_H_ ]

common/rapidjson/rapidjson/prettywriter.h

@@ -1,195 +0,0 @@
-#ifndef RAPIDJSON_PRETTYWRITER_H_
-#define RAPIDJSON_PRETTYWRITER_H_
-
-#include "writer.h"
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-namespace rapidjson {
-
-//! Writer with indentation and spacing.
-/*!
-	\tparam OutputStream Type of ouptut os.
-	\tparam SourceEncoding Encoding of source string.
-	\tparam TargetEncoding Encoding of output stream.
-	\tparam Allocator Type of allocator for allocating memory of stack.
-*/
-template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename Allocator = MemoryPoolAllocator<> >
-class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding, Allocator> {
-public:
-	typedef Writer<OutputStream, SourceEncoding, TargetEncoding, Allocator> Base;
-	typedef typename Base::Ch Ch;
-
-	//! Constructor
-	/*! \param os Output stream.
-		\param allocator User supplied allocator. If it is null, it will create a private one.
-		\param levelDepth Initial capacity of stack.
-	*/
-	PrettyWriter(OutputStream& os, Allocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
-		Base(os, allocator, levelDepth), indentChar_(' '), indentCharCount_(4) {}
-
-	//! Overridden for fluent API, see \ref Writer::SetDoublePrecision()
-	PrettyWriter& SetDoublePrecision(int p) { Base::SetDoublePrecision(p); return *this; }
-
-	//! Set custom indentation.
-	/*! \param indentChar		Character for indentation. Must be whitespace character (' ', '\\t', '\\n', '\\r').
-		\param indentCharCount	Number of indent characters for each indentation level.
-		\note The default indentation is 4 spaces.
-	*/
-	PrettyWriter& SetIndent(Ch indentChar, unsigned indentCharCount) {
-		RAPIDJSON_ASSERT(indentChar == ' ' || indentChar == '\t' || indentChar == '\n' || indentChar == '\r');
-		indentChar_ = indentChar;
-		indentCharCount_ = indentCharCount;
-		return *this;
-	}
-
-	/*! @name Implementation of Handler
-		\see Handler
-	*/
-	//@{
-
-	bool Null()					{ PrettyPrefix(kNullType);   return Base::WriteNull(); }
-	bool Bool(bool b)			{ PrettyPrefix(b ? kTrueType : kFalseType); return Base::WriteBool(b); }
-	bool Int(int i)				{ PrettyPrefix(kNumberType); return Base::WriteInt(i); }
-	bool Uint(unsigned u)		{ PrettyPrefix(kNumberType); return Base::WriteUint(u); }
-	bool Int64(int64_t i64)		{ PrettyPrefix(kNumberType); return Base::WriteInt64(i64); }
-	bool Uint64(uint64_t u64)	{ PrettyPrefix(kNumberType); return Base::WriteUint64(u64);	 }
-	bool Double(double d)		{ PrettyPrefix(kNumberType); return Base::WriteDouble(d); }
-
-	bool String(const Ch* str, SizeType length, bool copy = false) {
-		(void)copy;
-		PrettyPrefix(kStringType);
-		return Base::WriteString(str, length);
-	}
-
-	bool StartObject() {
-		PrettyPrefix(kObjectType);
-		new (Base::level_stack_.template Push<typename Base::Level>()) typename Base::Level(false);
-		return Base::WriteStartObject();
-	}
-
-	bool EndObject(SizeType memberCount = 0) {
-		(void)memberCount;
-		RAPIDJSON_ASSERT(Base::level_stack_.GetSize() >= sizeof(typename Base::Level));
-		RAPIDJSON_ASSERT(!Base::level_stack_.template Top<typename Base::Level>()->inArray);
-		bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
-
-		if (!empty) {
-			Base::os_->Put('\n');
-			WriteIndent();
-		}
-		if (!Base::WriteEndObject())
-			return false;
-		if (Base::level_stack_.Empty())	// end of json text
-			Base::os_->Flush();
-		return true;
-	}
-
-	bool StartArray() {
-		PrettyPrefix(kArrayType);
-		new (Base::level_stack_.template Push<typename Base::Level>()) typename Base::Level(true);
-		return Base::WriteStartArray();
-	}
-
-	bool EndArray(SizeType memberCount = 0) {
-		(void)memberCount;
-		RAPIDJSON_ASSERT(Base::level_stack_.GetSize() >= sizeof(typename Base::Level));
-		RAPIDJSON_ASSERT(Base::level_stack_.template Top<typename Base::Level>()->inArray);
-		bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
-
-		if (!empty) {
-			Base::os_->Put('\n');
-			WriteIndent();
-		}
-		if (!Base::WriteEndArray())
-			return false;
-		if (Base::level_stack_.Empty())	// end of json text
-			Base::os_->Flush();
-		return true;
-	}
-
-	//@}
-
-	/*! @name Convenience extensions */
-	//@{
-
-	//! Simpler but slower overload.
-	bool String(const Ch* str) { return String(str, internal::StrLen(str)); }
-
-	//! Overridden for fluent API, see \ref Writer::Double()
-	bool Double(double d, int precision) {
-		int oldPrecision = Base::GetDoublePrecision();
-		SetDoublePrecision(precision);
-		bool ret = Double(d);
-		SetDoublePrecision(oldPrecision);
-		return ret;
-	}
-
-	//@}
-protected:
-	void PrettyPrefix(Type type) {
-		(void)type;
-		if (Base::level_stack_.GetSize() != 0) { // this value is not at root
-			typename Base::Level* level = Base::level_stack_.template Top<typename Base::Level>();
-
-			if (level->inArray) {
-				if (level->valueCount > 0) {
-					Base::os_->Put(','); // add comma if it is not the first element in array
-					Base::os_->Put('\n');
-				}
-				else
-					Base::os_->Put('\n');
-				WriteIndent();
-			}
-			else {	// in object
-				if (level->valueCount > 0) {
-					if (level->valueCount % 2 == 0) {
-						Base::os_->Put(',');
-						Base::os_->Put('\n');
-					}
-					else {
-						Base::os_->Put(':');
-						Base::os_->Put(' ');
-					}
-				}
-				else
-					Base::os_->Put('\n');
-
-				if (level->valueCount % 2 == 0)
-					WriteIndent();
-			}
-			if (!level->inArray && level->valueCount % 2 == 0)
-				RAPIDJSON_ASSERT(type == kStringType);  // if it's in object, then even number should be a name
-			level->valueCount++;
-		}
-		else {
-			RAPIDJSON_ASSERT(type == kObjectType || type == kArrayType);
-			RAPIDJSON_ASSERT(!Base::hasRoot_);	// Should only has one and only one root.
-			Base::hasRoot_ = true;
-		}
-	}
-
-	void WriteIndent()  {
-		size_t count = (Base::level_stack_.GetSize() / sizeof(typename Base::Level)) * indentCharCount_;
-		PutN(*Base::os_, indentChar_, count);
-	}
-
-	Ch indentChar_;
-	unsigned indentCharCount_;
-
-private:
-	// Prohibit copy constructor & assignment operator.
-	PrettyWriter(const PrettyWriter&);
-	PrettyWriter& operator=(const PrettyWriter&);
-};
-
-} // namespace rapidjson
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_RAPIDJSON_H_

common/rapidjson/rapidjson/rapidjson.h

@@ -1,397 +0,0 @@
-#ifndef RAPIDJSON_RAPIDJSON_H_
-#define RAPIDJSON_RAPIDJSON_H_
-
-// Copyright (c) 2011 Milo Yip (miloyip@gmail.com)
-// Version 0.1
-
-/*!\file rapidjson.h
-	\brief common definitions and configuration
-
-	\todo Complete Doxygen documentation for configure macros.
- */
-
-#include <cstdlib>	// malloc(), realloc(), free()
-#include <cstring>	// memcpy()
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_NO_INT64DEFINE
-
-// Here defines int64_t and uint64_t types in global namespace as well as the
-// (U)INT64_C constant macros.
-// If user have their own definition, can define RAPIDJSON_NO_INT64DEFINE to disable this.
-#ifndef RAPIDJSON_NO_INT64DEFINE
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#ifndef __STDC_CONSTANT_MACROS
-#  define __STDC_CONSTANT_MACROS 1 // required by C++ standard
-#endif
-#ifdef _MSC_VER
-#include "msinttypes/stdint.h"
-#include "msinttypes/inttypes.h"
-#else
-// Other compilers should have this.
-#include <stdint.h>
-#include <inttypes.h>
-#endif
-//!@endcond
-#endif // RAPIDJSON_NO_INT64TYPEDEF
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_FORCEINLINE
-
-#ifndef RAPIDJSON_FORCEINLINE
-#ifdef _MSC_VER
-#define RAPIDJSON_FORCEINLINE __forceinline
-#else
-#define RAPIDJSON_FORCEINLINE
-#endif
-#endif // RAPIDJSON_FORCEINLINE
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_ENDIAN
-#define RAPIDJSON_LITTLEENDIAN	0	//!< Little endian machine
-#define RAPIDJSON_BIGENDIAN		1	//!< Big endian machine
-
-//! Endianness of the machine.
-/*!	GCC 4.6 provided macro for detecting endianness of the target machine. But other
-	compilers may not have this. User can define RAPIDJSON_ENDIAN to either
-	\ref RAPIDJSON_LITTLEENDIAN or \ref RAPIDJSON_BIGENDIAN.
-
-	Implemented with reference to 
-	https://gcc.gnu.org/onlinedocs/gcc-4.6.0/cpp/Common-Predefined-Macros.html
-	http://www.boost.org/doc/libs/1_42_0/boost/detail/endian.hpp
-*/
-#ifndef RAPIDJSON_ENDIAN
-// Detect with GCC 4.6's macro
-#  ifdef __BYTE_ORDER__
-#    if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#      define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
-#    elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#      define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
-#    else
-#      error Unknown machine endianess detected. User needs to define RAPIDJSON_ENDIAN.
-#	 endif // __BYTE_ORDER__
-// Detect with GLIBC's endian.h
-#  elif defined(__GLIBC__)
-#    include <endian.h>
-#    if (__BYTE_ORDER == __LITTLE_ENDIAN)
-#      define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
-#	 elif (__BYTE_ORDER == __BIG_ENDIAN)
-#      define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
-#	 else
-#      error Unknown machine endianess detected. User needs to define RAPIDJSON_ENDIAN.
-#   endif // __GLIBC__
-// Detect with _LITTLE_ENDIAN and _BIG_ENDIAN macro
-#  elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)
-#	 define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
-#  elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN)
-#	 define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
-// Detect with architecture macros
-#  elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__) || defined(__hpux) || defined(__hppa) || defined(_MIPSEB) || defined(_POWER) || defined(__s390__)
-#	 define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
-#  elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__)
-#	 define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
-#  else
-#    error Unknown machine endianess detected. User needs to define RAPIDJSON_ENDIAN.	
-#  endif
-#endif // RAPIDJSON_ENDIAN
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_ALIGNSIZE
-
-//! Data alignment of the machine.
-/*!
-	Some machine requires strict data alignment.
-	Currently the default uses 4 bytes alignment. User can customize this.
-*/
-#ifndef RAPIDJSON_ALIGN
-#define RAPIDJSON_ALIGN(x) ((x + 3u) & ~3u)
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_SSE2/RAPIDJSON_SSE42/RAPIDJSON_SIMD
-
-// Enable SSE2 optimization.
-//#define RAPIDJSON_SSE2
-
-// Enable SSE4.2 optimization.
-//#define RAPIDJSON_SSE42
-
-#if defined(RAPIDJSON_SSE2) || defined(RAPIDJSON_SSE42)
-#define RAPIDJSON_SIMD
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_NO_SIZETYPEDEFINE
-
-#ifndef RAPIDJSON_NO_SIZETYPEDEFINE
-namespace rapidjson {
-//! Use 32-bit array/string indices even for 64-bit platform, instead of using size_t.
-/*! User may override the SizeType by defining RAPIDJSON_NO_SIZETYPEDEFINE.
-*/
-typedef unsigned SizeType;
-} // namespace rapidjson
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_ASSERT
-
-//! Assertion.
-/*! By default, rapidjson uses C assert() for assertion.
-	User can override it by defining RAPIDJSON_ASSERT(x) macro.
-*/
-#ifndef RAPIDJSON_ASSERT
-#include <cassert>
-#define RAPIDJSON_ASSERT(x) assert(x)
-#endif // RAPIDJSON_ASSERT
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_STATIC_ASSERT
-
-// Adopt from boost
-#ifndef RAPIDJSON_STATIC_ASSERT
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-namespace rapidjson {
-
-template <bool x> struct STATIC_ASSERTION_FAILURE;
-template <> struct STATIC_ASSERTION_FAILURE<true> { enum { value = 1 }; };
-template<int x> struct StaticAssertTest {};
-} // namespace rapidjson
-
-#define RAPIDJSON_JOIN(X, Y) RAPIDJSON_DO_JOIN(X, Y)
-#define RAPIDJSON_DO_JOIN(X, Y) RAPIDJSON_DO_JOIN2(X, Y)
-#define RAPIDJSON_DO_JOIN2(X, Y) X##Y
-
-#if defined(__GNUC__)
-#define RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused))
-#else
-#define RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE 
-#endif
-//!@endcond
-
-/*! \def RAPIDJSON_STATIC_ASSERT
-	\brief (internal) macro to check for conditions at compile-time
-	\param x compile-time condition
-	\hideinitializer
- */
-#define RAPIDJSON_STATIC_ASSERT(x) typedef ::rapidjson::StaticAssertTest<\
-	sizeof(::rapidjson::STATIC_ASSERTION_FAILURE<bool(x) >)>\
-	RAPIDJSON_JOIN(StaticAssertTypedef, __LINE__) RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// Helpers
-
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-
-#define RAPIDJSON_MULTILINEMACRO_BEGIN do {  
-#define RAPIDJSON_MULTILINEMACRO_END \
-} while((void)0, 0)
-
-// adopted from Boost
-#define RAPIDJSON_VERSION_CODE(x,y,z) \
-  (((x)*100000) + ((y)*100) + (z))
-
-// token stringification
-#define RAPIDJSON_STRINGIFY(x) RAPIDJSON_DO_STRINGIFY(x)
-#define RAPIDJSON_DO_STRINGIFY(x) #x
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_DIAG_PUSH/POP, RAPIDJSON_DIAG_OFF
-
-#if defined(__clang__) || (defined(__GNUC__) && RAPIDJSON_VERSION_CODE(__GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__) >= RAPIDJSON_VERSION_CODE(4,2,0))
-
-#define RAPIDJSON_PRAGMA(x) _Pragma(RAPIDJSON_STRINGIFY(x))
-#define RAPIDJSON_DIAG_PRAGMA(x) RAPIDJSON_PRAGMA(GCC diagnostic x)
-#define RAPIDJSON_DIAG_OFF(x) \
-	RAPIDJSON_DIAG_PRAGMA(ignored RAPIDJSON_STRINGIFY(RAPIDJSON_JOIN(-W,x)))
-
-// push/pop support in Clang and GCC>=4.6
-#if defined(__clang__) || (defined(__GNUC__) && RAPIDJSON_VERSION_CODE(__GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__) >= RAPIDJSON_VERSION_CODE(4,6,0))
-#define RAPIDJSON_DIAG_PUSH RAPIDJSON_DIAG_PRAGMA(push)
-#define RAPIDJSON_DIAG_POP  RAPIDJSON_DIAG_PRAGMA(pop)
-#else // GCC >= 4.2, < 4.6
-#define RAPIDJSON_DIAG_PUSH /* ignored */
-#define RAPIDJSON_DIAG_POP /* ignored */
-#endif
-
-#elif defined(_MSC_VER)
-
-// pragma (MSVC specific)
-#define RAPIDJSON_PRAGMA(x) __pragma(x)
-#define RAPIDJSON_DIAG_PRAGMA(x) RAPIDJSON_PRAGMA(warning(x))
-
-#define RAPIDJSON_DIAG_OFF(x) RAPIDJSON_DIAG_PRAGMA(disable: x)
-#define RAPIDJSON_DIAG_PUSH RAPIDJSON_DIAG_PRAGMA(push)
-#define RAPIDJSON_DIAG_POP  RAPIDJSON_DIAG_PRAGMA(pop)
-
-#else
-
-#define RAPIDJSON_DIAG_OFF(x) /* ignored */
-#define RAPIDJSON_DIAG_PUSH   /* ignored */
-#define RAPIDJSON_DIAG_POP    /* ignored */
-
-#endif // RAPIDJSON_DIAG_*
-
-//!@endcond
-
-///////////////////////////////////////////////////////////////////////////////
-// Allocators and Encodings
-
-#include "allocators.h"
-#include "encodings.h"
-
-//! main RapidJSON namespace
-namespace rapidjson {
-
-///////////////////////////////////////////////////////////////////////////////
-//  Stream
-
-/*! \class rapidjson::Stream
-	\brief Concept for reading and writing characters.
-
-	For read-only stream, no need to implement PutBegin(), Put(), Flush() and PutEnd().
-
-	For write-only stream, only need to implement Put() and Flush().
-
-\code
-concept Stream {
-	typename Ch;	//!< Character type of the stream.
-
-	//! Read the current character from stream without moving the read cursor.
-	Ch Peek() const;
-
-	//! Read the current character from stream and moving the read cursor to next character.
-	Ch Take();
-
-	//! Get the current read cursor.
-	//! \return Number of characters read from start.
-	size_t Tell();
-
-	//! Begin writing operation at the current read pointer.
-	//! \return The begin writer pointer.
-	Ch* PutBegin();
-
-	//! Write a character.
-	void Put(Ch c);
-
-	//! Flush the buffer.
-	void Flush();
-
-	//! End the writing operation.
-	//! \param begin The begin write pointer returned by PutBegin().
-	//! \return Number of characters written.
-	size_t PutEnd(Ch* begin);
-}
-\endcode
-*/
-
-//! Provides additional information for stream.
-/*!
-	By using traits pattern, this type provides a default configuration for stream.
-	For custom stream, this type can be specialized for other configuration.
-	See TEST(Reader, CustomStringStream) in readertest.cpp for example.
-*/
-template<typename Stream>
-struct StreamTraits {
-	//! Whether to make local copy of stream for optimization during parsing.
-	/*!
-		By default, for safety, streams do not use local copy optimization.
-		Stream that can be copied fast should specialize this, like StreamTraits<StringStream>.
-	*/
-	enum { copyOptimization = 0 };
-};
-
-//! Put N copies of a character to a stream.
-template<typename Stream, typename Ch>
-inline void PutN(Stream& stream, Ch c, size_t n) {
-	for (size_t i = 0; i < n; i++)
-		stream.Put(c);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// StringStream
-
-//! Read-only string stream.
-/*! \note implements Stream concept
-*/
-template <typename Encoding>
-struct GenericStringStream {
-	typedef typename Encoding::Ch Ch;
-
-	GenericStringStream(const Ch *src) : src_(src), head_(src) {}
-
-	Ch Peek() const { return *src_; }
-	Ch Take() { return *src_++; }
-	size_t Tell() const { return static_cast<size_t>(src_ - head_); }
-
-	Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-	void Put(Ch) { RAPIDJSON_ASSERT(false); }
-	void Flush() { RAPIDJSON_ASSERT(false); }
-	size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-	const Ch* src_;		//!< Current read position.
-	const Ch* head_;	//!< Original head of the string.
-};
-
-template <typename Encoding>
-struct StreamTraits<GenericStringStream<Encoding> > {
-	enum { copyOptimization = 1 };
-};
-
-//! String stream with UTF8 encoding.
-typedef GenericStringStream<UTF8<> > StringStream;
-
-///////////////////////////////////////////////////////////////////////////////
-// InsituStringStream
-
-//! A read-write string stream.
-/*! This string stream is particularly designed for in-situ parsing.
-	\note implements Stream concept
-*/
-template <typename Encoding>
-struct GenericInsituStringStream {
-	typedef typename Encoding::Ch Ch;
-
-	GenericInsituStringStream(Ch *src) : src_(src), dst_(0), head_(src) {}
-
-	// Read
-	Ch Peek() { return *src_; }
-	Ch Take() { return *src_++; }
-	size_t Tell() { return static_cast<size_t>(src_ - head_); }
-
-	// Write
-	Ch* PutBegin() { return dst_ = src_; }
-	void Put(Ch c) { RAPIDJSON_ASSERT(dst_ != 0); *dst_++ = c; }
-	void Flush() {}
-	size_t PutEnd(Ch* begin) { return static_cast<size_t>(dst_ - begin); }
-
-	Ch* src_;
-	Ch* dst_;
-	Ch* head_;
-};
-
-template <typename Encoding>
-struct StreamTraits<GenericInsituStringStream<Encoding> > {
-	enum { copyOptimization = 1 };
-};
-
-//! Insitu string stream with UTF8 encoding.
-typedef GenericInsituStringStream<UTF8<> > InsituStringStream;
-
-///////////////////////////////////////////////////////////////////////////////
-// Type
-
-//! Type of JSON value
-enum Type {
-	kNullType = 0,		//!< null
-	kFalseType = 1,		//!< false
-	kTrueType = 2,		//!< true
-	kObjectType = 3,	//!< object
-	kArrayType = 4,		//!< array 
-	kStringType = 5,	//!< string
-	kNumberType = 6		//!< number
-};
-
-} // namespace rapidjson
-
-#endif // RAPIDJSON_RAPIDJSON_H_

common/rapidjson/rapidjson/stringbuffer.h

@@ -1,51 +0,0 @@
-#ifndef RAPIDJSON_STRINGBUFFER_H_
-#define RAPIDJSON_STRINGBUFFER_H_
-
-#include "rapidjson.h"
-#include "internal/stack.h"
-
-namespace rapidjson {
-
-//! Represents an in-memory output stream.
-/*!
-	\tparam Encoding Encoding of the stream.
-	\tparam Allocator type for allocating memory buffer.
-	\note implements Stream concept
-*/
-template <typename Encoding, typename Allocator = CrtAllocator>
-struct GenericStringBuffer {
-	typedef typename Encoding::Ch Ch;
-
-	GenericStringBuffer(Allocator* allocator = 0, size_t capacity = kDefaultCapacity) : stack_(allocator, capacity) {}
-
-	void Put(Ch c) { *stack_.template Push<Ch>() = c; }
-	void Flush() {}
-
-	void Clear() { stack_.Clear(); }
-
-	const Ch* GetString() const {
-		// Push and pop a null terminator. This is safe.
-		*stack_.template Push<Ch>() = '\0';
-		stack_.template Pop<Ch>(1);
-
-		return stack_.template Bottom<Ch>();
-	}
-
-	size_t GetSize() const { return stack_.GetSize(); }
-
-	static const size_t kDefaultCapacity = 256;
-	mutable internal::Stack<Allocator> stack_;
-};
-
-//! String buffer with UTF8 encoding
-typedef GenericStringBuffer<UTF8<> > StringBuffer;
-
-//! Implement specialized version of PutN() with memset() for better performance.
-template<>
-inline void PutN(GenericStringBuffer<UTF8<> >& stream, char c, size_t n) {
-	memset(stream.stack_.Push<char>(n), c, n * sizeof(c));
-}
-
-} // namespace rapidjson
-
-#endif // RAPIDJSON_STRINGBUFFER_H_

common/rapidjson/rapidjson/writer.h

@@ -1,387 +0,0 @@
-#ifndef RAPIDJSON_WRITER_H_
-#define RAPIDJSON_WRITER_H_
-
-#include "rapidjson.h"
-#include "internal/stack.h"
-#include "internal/strfunc.h"
-#include <cstdio>	// snprintf() or _sprintf_s()
-#include <new>		// placement new
-
-#ifdef _MSC_VER
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
-#endif
-
-namespace rapidjson {
-
-//! JSON writer
-/*! Writer implements the concept Handler.
-	It generates JSON text by events to an output os.
-
-	User may programmatically calls the functions of a writer to generate JSON text.
-
-	On the other side, a writer can also be passed to objects that generates events, 
-
-	for example Reader::Parse() and Document::Accept().
-
-	\tparam OutputStream Type of output stream.
-	\tparam SourceEncoding Encoding of source string.
-	\tparam TargetEncoding Encoding of output stream.
-	\tparam Allocator Type of allocator for allocating memory of stack.
-	\note implements Handler concept
-*/
-template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename Allocator = MemoryPoolAllocator<> >
-class Writer {
-public:
-	typedef typename SourceEncoding::Ch Ch;
-
-	//! Constructor
-	/*! \param os Output stream.
-		\param allocator User supplied allocator. If it is null, it will create a private one.
-		\param levelDepth Initial capacity of stack.
-	*/
-	Writer(OutputStream& os, Allocator* allocator = 0, size_t levelDepth = kDefaultLevelDepth) : 
-		os_(&os), level_stack_(allocator, levelDepth * sizeof(Level)),
-		doublePrecision_(kDefaultDoublePrecision), hasRoot_(false) {}
-
-	//! Reset the writer with a new stream.
-	/*!
-		This function reset the writer with a new stream and default settings,
-		in order to make a Writer object reusable for output multiple JSONs.
-
-		\param os New output stream.
-		\code
-		Writer<OutputStream> writer(os1);
-		writer.StartObject();
-		// ...
-		writer.EndObject();
-
-		writer.Reset(os2);
-		writer.StartObject();
-		// ...
-		writer.EndObject();
-		\endcode
-	*/
-	void Reset(OutputStream& os) {
-		os_ = &os;
-		doublePrecision_ = kDefaultDoublePrecision;
-		hasRoot_ = false;
-		level_stack_.Clear();
-	}
-
-	//! Checks whether the output is a complete JSON.
-	/*!
-		A complete JSON has a complete root object or array.
-	*/
-	bool IsComplete() const {
-		return hasRoot_ && level_stack_.Empty();
-	}
-
-	//! Set the number of significant digits for \c double values
-	/*! When writing a \c double value to the \c OutputStream, the number
-		of significant digits is limited to 6 by default.
-		\param p maximum number of significant digits (default: 6)
-		\return The Writer itself for fluent API.
-	*/
-	Writer& SetDoublePrecision(int p = kDefaultDoublePrecision) {
-		if (p < 0) p = kDefaultDoublePrecision; // negative precision is ignored
-		doublePrecision_ = p;
-		return *this;
-	}
-
-	//! \see SetDoublePrecision()
-	int GetDoublePrecision() const { return doublePrecision_; }
-
-	/*!@name Implementation of Handler
-		\see Handler
-	*/
-	//@{
-
-	bool Null()					{ Prefix(kNullType);   return WriteNull(); }
-	bool Bool(bool b)			{ Prefix(b ? kTrueType : kFalseType); return WriteBool(b); }
-	bool Int(int i)				{ Prefix(kNumberType); return WriteInt(i); }
-	bool Uint(unsigned u)		{ Prefix(kNumberType); return WriteUint(u); }
-	bool Int64(int64_t i64)		{ Prefix(kNumberType); return WriteInt64(i64); }
-	bool Uint64(uint64_t u64)	{ Prefix(kNumberType); return WriteUint64(u64); }
-
-	//! Writes the given \c double value to the stream
-	/*!
-		The number of significant digits (the precision) to be written
-		can be set by \ref SetDoublePrecision() for the Writer:
-		\code
-		Writer<...> writer(...);
-		writer.SetDoublePrecision(12).Double(M_PI);
-		\endcode
-		\param d The value to be written.
-		\return Whether it is succeed.
-	*/
-	bool Double(double d)		{ Prefix(kNumberType); return WriteDouble(d); }
-
-	bool String(const Ch* str, SizeType length, bool copy = false) {
-		(void)copy;
-		Prefix(kStringType);
-		return WriteString(str, length);
-	}
-
-	bool StartObject() {
-		Prefix(kObjectType);
-		new (level_stack_.template Push<Level>()) Level(false);
-		return WriteStartObject();
-	}
-
-	bool EndObject(SizeType memberCount = 0) {
-		(void)memberCount;
-		RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level));
-		RAPIDJSON_ASSERT(!level_stack_.template Top<Level>()->inArray);
-		level_stack_.template Pop<Level>(1);
-		bool ret = WriteEndObject();
-		if (level_stack_.Empty())	// end of json text
-			os_->Flush();
-		return ret;
-	}
-
-	bool StartArray() {
-		Prefix(kArrayType);
-		new (level_stack_.template Push<Level>()) Level(true);
-		return WriteStartArray();
-	}
-
-	bool EndArray(SizeType elementCount = 0) {
-		(void)elementCount;
-		RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level));
-		RAPIDJSON_ASSERT(level_stack_.template Top<Level>()->inArray);
-		level_stack_.template Pop<Level>(1);
-		bool ret = WriteEndArray();
-		if (level_stack_.Empty())	// end of json text
-			os_->Flush();
-		return ret;
-	}
-	//@}
-
-	/*! @name Convenience extensions */
-	//@{
-
-	//! Writes the given \c double value to the stream (explicit precision)
-	/*!
-		The currently set double precision is ignored in favor of the explicitly
-		given precision for this value.
-		\see Double(), SetDoublePrecision(), GetDoublePrecision()
-		\param d The value to be written
-		\param precision The number of significant digits for this value
-		\return Whether it is succeeded.
-	*/
-	bool Double(double d, int precision) {
-		int oldPrecision = GetDoublePrecision();
-		SetDoublePrecision(precision);
-		bool ret = Double(d);
-		SetDoublePrecision(oldPrecision);
-		return ret;
-	}
-
-	//! Simpler but slower overload.
-	bool String(const Ch* str) { return String(str, internal::StrLen(str)); }
-
-	//@}
-
-protected:
-	//! Information for each nested level
-	struct Level {
-		Level(bool inArray_) : valueCount(0), inArray(inArray_) {}
-		size_t valueCount;	//!< number of values in this level
-		bool inArray;		//!< true if in array, otherwise in object
-	};
-
-	static const size_t kDefaultLevelDepth = 32;
-
-	bool WriteNull()  {
-		os_->Put('n'); os_->Put('u'); os_->Put('l'); os_->Put('l'); return true;
-	}
-
-	bool WriteBool(bool b)  {
-		if (b) {
-			os_->Put('t'); os_->Put('r'); os_->Put('u'); os_->Put('e');
-		}
-		else {
-			os_->Put('f'); os_->Put('a'); os_->Put('l'); os_->Put('s'); os_->Put('e');
-		}
-		return true;
-	}
-
-	bool WriteInt(int i) {
-		if (i < 0) {
-			os_->Put('-');
-			i = -i;
-		}
-		return WriteUint((unsigned)i);
-	}
-
-	bool WriteUint(unsigned u) {
-		char buffer[10];
-		char *p = buffer;
-		do {
-			*p++ = char(u % 10) + '0';
-			u /= 10;
-		} while (u > 0);
-
-		do {
-			--p;
-			os_->Put(*p);
-		} while (p != buffer);
-		return true;
-	}
-
-	bool WriteInt64(int64_t i64) {
-		if (i64 < 0) {
-			os_->Put('-');
-			i64 = -i64;
-		}
-		WriteUint64((uint64_t)i64);
-		return true;
-	}
-
-	bool WriteUint64(uint64_t u64) {
-		char buffer[20];
-		char *p = buffer;
-		do {
-			*p++ = char(u64 % 10) + '0';
-			u64 /= 10;
-		} while (u64 > 0);
-
-		do {
-			--p;
-			os_->Put(*p);
-		} while (p != buffer);
-		return true;
-	}
-
-#ifdef _MSC_VER
-#define RAPIDJSON_SNPRINTF sprintf_s
-#else
-#define RAPIDJSON_SNPRINTF snprintf
-#endif
-
-	//! \todo Optimization with custom double-to-string converter.
-	bool WriteDouble(double d) {
-		char buffer[100];
-		int ret = RAPIDJSON_SNPRINTF(buffer, sizeof(buffer), "%.*g", doublePrecision_, d);
-		RAPIDJSON_ASSERT(ret >= 1);
-		for (int i = 0; i < ret; i++)
-			os_->Put(buffer[i]);
-		return true;
-	}
-#undef RAPIDJSON_SNPRINTF
-
-	bool WriteString(const Ch* str, SizeType length)  {
-		static const char hexDigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-		static const char escape[256] = {
-#define Z16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-			//0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
-			'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'b', 't', 'n', 'u', 'f', 'r', 'u', 'u', // 00
-			'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', // 10
-			  0,   0, '"',   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 20
-			Z16, Z16,																		// 30~4F
-			  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,'\\',   0,   0,   0, // 50
-			Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16								// 60~FF
-#undef Z16
-		};
-
-		os_->Put('\"');
-		GenericStringStream<SourceEncoding> is(str);
-		while (is.Tell() < length) {
-			const Ch c = is.Peek();
-			if (!TargetEncoding::supportUnicode && (unsigned)c >= 0x80) {
-				// Unicode escaping
-				unsigned codepoint;
-				if (!SourceEncoding::Decode(is, &codepoint))
-					return false;
-				os_->Put('\\');
-				os_->Put('u');
-				if (codepoint <= 0xD7FF || (codepoint >= 0xE000 && codepoint <= 0xFFFF)) {
-					os_->Put(hexDigits[(codepoint >> 12) & 15]);
-					os_->Put(hexDigits[(codepoint >>  8) & 15]);
-					os_->Put(hexDigits[(codepoint >>  4) & 15]);
-					os_->Put(hexDigits[(codepoint      ) & 15]);
-				}
-				else if (codepoint >= 0x010000 && codepoint <= 0x10FFFF)	{
-					// Surrogate pair
-					unsigned s = codepoint - 0x010000;
-					unsigned lead = (s >> 10) + 0xD800;
-					unsigned trail = (s & 0x3FF) + 0xDC00;
-					os_->Put(hexDigits[(lead >> 12) & 15]);
-					os_->Put(hexDigits[(lead >>  8) & 15]);
-					os_->Put(hexDigits[(lead >>  4) & 15]);
-					os_->Put(hexDigits[(lead      ) & 15]);
-					os_->Put('\\');
-					os_->Put('u');
-					os_->Put(hexDigits[(trail >> 12) & 15]);
-					os_->Put(hexDigits[(trail >>  8) & 15]);
-					os_->Put(hexDigits[(trail >>  4) & 15]);
-					os_->Put(hexDigits[(trail      ) & 15]);					
-				}
-				else
-					return false;	// invalid code point
-			}
-			else if ((sizeof(Ch) == 1 || (unsigned)c < 256) && escape[(unsigned char)c])  {
-				is.Take();
-				os_->Put('\\');
-				os_->Put(escape[(unsigned char)c]);
-				if (escape[(unsigned char)c] == 'u') {
-					os_->Put('0');
-					os_->Put('0');
-					os_->Put(hexDigits[(unsigned char)c >> 4]);
-					os_->Put(hexDigits[(unsigned char)c & 0xF]);
-				}
-			}
-			else
-				Transcoder<SourceEncoding, TargetEncoding>::Transcode(is, *os_);
-		}
-		os_->Put('\"');
-		return true;
-	}
-
-	bool WriteStartObject()	{ os_->Put('{'); return true; }
-	bool WriteEndObject()	{ os_->Put('}'); return true; }
-	bool WriteStartArray()	{ os_->Put('['); return true; }
-	bool WriteEndArray()	{ os_->Put(']'); return true; }
-
-	void Prefix(Type type) {
-		(void)type;
-		if (level_stack_.GetSize() != 0) { // this value is not at root
-			Level* level = level_stack_.template Top<Level>();
-			if (level->valueCount > 0) {
-				if (level->inArray) 
-					os_->Put(','); // add comma if it is not the first element in array
-				else  // in object
-					os_->Put((level->valueCount % 2 == 0) ? ',' : ':');
-			}
-			if (!level->inArray && level->valueCount % 2 == 0)
-				RAPIDJSON_ASSERT(type == kStringType);  // if it's in object, then even number should be a name
-			level->valueCount++;
-		}
-		else {
-			RAPIDJSON_ASSERT(type == kObjectType || type == kArrayType);
-			RAPIDJSON_ASSERT(!hasRoot_);	// Should only has one and only one root.
-			hasRoot_ = true;
-		}
-	}
-
-	OutputStream* os_;
-	internal::Stack<Allocator> level_stack_;
-	int doublePrecision_;
-	bool hasRoot_;
-
-	static const int kDefaultDoublePrecision = 6;
-
-private:
-	// Prohibit copy constructor & assignment operator.
-	Writer(const Writer&);
-	Writer& operator=(const Writer&);
-};
-
-} // namespace rapidjson
-
-#ifdef _MSC_VER
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_RAPIDJSON_H_

common/ruletypes.h

@@ -144,6 +144,9 @@ RULE_BOOL(Character, RestrictSpellScribing, false) // Restricts spell scribing t
 RULE_BOOL(Character, UseStackablePickPocketing, true) // Allows stackable pickpocketed items to stack instead of only being allowed in empty inventory slots
 RULE_BOOL(Character, EnableAvoidanceCap, false)
 RULE_INT(Character, AvoidanceCap, 750) // 750 Is a pretty good value, seen people dodge all attacks beyond 1,000 Avoidance
+RULE_BOOL(Character, AllowMQTarget, false) // Disables putting players in the 'hackers' list for targeting beyond the clip plane or attempting to target something untargetable
+RULE_BOOL(Character, UseOldBindWound, false) // Uses the original bind wound behavior
+
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Mercs)
@@ -205,6 +208,7 @@ RULE_INT(World, ExemptMaxClientsStatus, -1) // Exempt accounts from the MaxClien
 RULE_INT(World, AddMaxClientsPerIP, -1) // Maximum number of clients allowed to connect per IP address if account status is < ExemptMaxClientsStatus. Default value: -1 (feature disabled)
 RULE_INT(World, AddMaxClientsStatus, -1) // Accounts with status >= this rule will be allowed to use the amount of accounts defined in the AddMaxClientsPerIP. Default value: -1 (feature disabled)
 RULE_BOOL(World, MaxClientsSetByStatus, false) // If True, IP Limiting will be set to the status on the account as long as the status is > MaxClientsPerIP
+RULE_BOOL(World, EnableIPExemptions, false) // If True, ip_exemptions table is used, if there is no entry for the IP it will default to RuleI(World, MaxClientsPerIP)
 RULE_BOOL(World, ClearTempMerchantlist, true) // Clears temp merchant items when world boots.
 RULE_BOOL(World, DeleteStaleCorpeBackups, true) // Deletes stale corpse backups older than 2 weeks.
 RULE_INT(World, AccountSessionLimit, -1) //Max number of characters allowed on at once from a single account (-1 is disabled)
@@ -252,6 +256,7 @@ RULE_INT(Zone, WeatherTimer, 600) // Weather timer when no duration is available
 RULE_BOOL(Zone, EnableLoggedOffReplenishments, true)
 RULE_INT(Zone, MinOfflineTimeToReplenishments, 21600) // 21600 seconds is 6 Hours
 RULE_BOOL(Zone, UseZoneController, true) // Enables the ability to use persistent quest based zone controllers (zone_controller.pl/lua)
+RULE_BOOL(Zone, EnableZoneControllerGlobals, false) // Enables the ability to use quest globals with the zone controller NPC
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Map)
@@ -382,6 +387,7 @@ RULE_BOOL(Spells, AlwaysSendTargetsBuffs, false) // ignore LAA level if true
 RULE_BOOL(Spells, FlatItemExtraSpellAmt, false) // allow SpellDmg stat to affect all spells, regardless of cast time/cooldown/etc
 RULE_BOOL(Spells, IgnoreSpellDmgLvlRestriction, false) // ignore the 5 level spread on applying SpellDmg
 RULE_BOOL(Spells, AllowItemTGB, false) // TGB doesn't work with items on live, custom servers want it though
+RULE_BOOL(Spells, NPCInnateProcOverride, true) //  NPC innate procs override the target type to single target.
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Combat)

common/servertalk.h

@@ -193,15 +193,10 @@
 #define ServerOP_QSSendQuery						0x5016
 #define ServerOP_CZSignalNPC						0x5017
 #define ServerOP_CZSetEntityVariableByNPCTypeID		0x5018
-
-#define ServerOP_WIRemoteCall 0x5001
-#define ServerOP_WIRemoteCallResponse 0x5002
-#define ServerOP_WIRemoteCallToClient 0x5003
-#define ServerOP_WIClientSession 0x5004
-#define ServerOP_WIClientSessionResponse 0x5005
+#define ServerOP_WWMarquee							0x5019
 
 /* Query Serv Generic Packet Flag/Type Enumeration */
-enum { QSG_LFGuild = 0 };
+enum { QSG_LFGuild = 0 }; 
 enum {	QSG_LFGuild_PlayerMatches = 0, QSG_LFGuild_UpdatePlayerInfo, QSG_LFGuild_RequestPlayerInfo, QSG_LFGuild_UpdateGuildInfo, QSG_LFGuild_GuildMatches,
 	QSG_LFGuild_RequestGuildInfo };
 
@@ -1260,6 +1255,15 @@ struct CZMessagePlayer_Struct {
 	char	Message[512];
 };
 
+struct WWMarquee_Struct {
+	uint32 Type;
+	uint32 Priority;
+	uint32 FadeIn;
+	uint32 FadeOut;
+	uint32 Duration;
+	char Message[512];
+};
+
 struct CZSetEntVarByNPCTypeID_Struct {
 	uint32 npctype_id;
 	char id[256];

common/shareddb.cpp

@@ -2052,27 +2052,3 @@ void SharedDatabase::SaveCharacterInspectMessage(uint32 character_id, const Insp
 	std::string query = StringFormat("REPLACE INTO `character_inspect_messages` (id, inspect_message) VALUES (%u, '%s')", character_id, EscapeString(message->text).c_str());
 	auto results = QueryDatabase(query);
 }
-
-bool SharedDatabase::VerifyToken(std::string token, int& status) {
-	status = 0;
-	if (token.length() > 64) {
-		token = token.substr(0, 64);
-	}
-
-	token = EscapeString(token);
-	std::string query = StringFormat("SELECT status FROM tokens WHERE token='%s'", token.c_str());
-	auto results = QueryDatabase(query);
-	if (!results.Success())
-	{
-		std::cerr << "Error in SharedDatabase::VerifyToken query '" << query << "' " << results.ErrorMessage() << std::endl;
-		return false;
-	}
-
-	if (results.RowCount() != 1) {
-		return false;
-	}
-
-	auto row = results.begin();
-	status = atoi(row[0]);
-	return true;
-}

common/shareddb.h

@@ -103,9 +103,6 @@ class SharedDatabase : public Database
 		ItemInst* CreateItem(const EQEmu::ItemBase* item, int16 charges = 0, uint32 aug1 = 0, uint32 aug2 = 0, uint32 aug3 = 0, uint32 aug4 = 0, uint32 aug5 = 0, uint32 aug6 = 0, uint8 attuned = 0);
 		ItemInst* CreateBaseItem(const EQEmu::ItemBase* item, int16 charges = 0);
 
-		// Web Token Verification
-		bool VerifyToken(std::string token, int& status);
-
 		/*
 		    Shared Memory crap
 		*/

common/struct_strategy.cpp

@@ -18,7 +18,7 @@ StructStrategy::StructStrategy() {
 	}
 }
 
-void StructStrategy::Encode(EQApplicationPacket **p, std::shared_ptr<EQStream> dest, bool ack_req) const {
+void StructStrategy::Encode(EQApplicationPacket **p, std::shared_ptr<EQStreamInterface> dest, bool ack_req) const {
 	if((*p)->GetOpcodeBypass() != 0) {
 		PassEncoder(p, dest, ack_req);
 		return;
@@ -36,7 +36,7 @@ void StructStrategy::Decode(EQApplicationPacket *p) const {
 }
 
 
-void StructStrategy::ErrorEncoder(EQApplicationPacket **in_p, std::shared_ptr<EQStream> dest, bool ack_req) {
+void StructStrategy::ErrorEncoder(EQApplicationPacket **in_p, std::shared_ptr<EQStreamInterface> dest, bool ack_req) {
 	EQApplicationPacket *p = *in_p;
 	*in_p = nullptr;
 
@@ -50,7 +50,7 @@ void StructStrategy::ErrorDecoder(EQApplicationPacket *p) {
 	p->SetOpcode(OP_Unknown);
 }
 
-void StructStrategy::PassEncoder(EQApplicationPacket **p, std::shared_ptr<EQStream> dest, bool ack_req) {
+void StructStrategy::PassEncoder(EQApplicationPacket **p, std::shared_ptr<EQStreamInterface> dest, bool ack_req) {
 	dest->FastQueuePacket(p, ack_req);
 }
 

common/struct_strategy.h

@@ -2,7 +2,7 @@
 #define STRUCTSTRATEGY_H_
 
 class EQApplicationPacket;
-class EQStream;
+class EQStreamInterface;
 #include "emu_opcodes.h"
 #include "emu_versions.h"
 
@@ -12,7 +12,7 @@ class EQStream;
 class StructStrategy {
 public:
 	//the encoder takes ownership of the supplied packet, and may enqueue multiple resulting packets into the stream
-	typedef void(*Encoder)(EQApplicationPacket **p, std::shared_ptr<EQStream> dest, bool ack_req);
+	typedef void(*Encoder)(EQApplicationPacket **p, std::shared_ptr<EQStreamInterface> dest, bool ack_req);
 	//the decoder may only edit the supplied packet, producing a single packet for eqemu to consume.
 	typedef void (*Decoder)(EQApplicationPacket *p);
 
@@ -20,7 +20,7 @@ public:
 	virtual ~StructStrategy() {}
 
 	//this method takes an eqemu struct, and enqueues the produced structs into the stream.
-	void Encode(EQApplicationPacket **p, std::shared_ptr<EQStream> dest, bool ack_req) const;
+	void Encode(EQApplicationPacket **p, std::shared_ptr<EQStreamInterface> dest, bool ack_req) const;
 	//this method takes an EQ wire struct, and converts it into an eqemu struct
 	void Decode(EQApplicationPacket *p) const;
 
@@ -30,10 +30,10 @@ public:
 protected:
 	//some common coders:
 	//Print an error saying unknown struct/opcode and drop it
-	static void ErrorEncoder(EQApplicationPacket **p, std::shared_ptr<EQStream> dest, bool ack_req);
+	static void ErrorEncoder(EQApplicationPacket **p, std::shared_ptr<EQStreamInterface> dest, bool ack_req);
 	static void ErrorDecoder(EQApplicationPacket *p);
 	//pass the packet through without modification (emu == EQ) (default)
-	static void PassEncoder(EQApplicationPacket **p, std::shared_ptr<EQStream> dest, bool ack_req);
+	static void PassEncoder(EQApplicationPacket **p, std::shared_ptr<EQStreamInterface> dest, bool ack_req);
 	static void PassDecoder(EQApplicationPacket *p);
 
 	Encoder encoders[_maxEmuOpcode];

common/uuid.cpp

@@ -1,44 +0,0 @@
-/*
-	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2014 EQEMu Development Team (http://eqemulator.net)
-	
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-	
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#include "uuid.h"
-
-#ifdef WIN32
-#include <rpc.h>
-#else
-#include <uuid/uuid.h>
-#endif
-
-std::string CreateUUID() {
-#ifdef WIN32
-	UUID uuid;
-	UuidCreate(&uuid);
-	unsigned char *str = nullptr;
-	UuidToStringA(&uuid, &str);
-	std::string s((char*)str);
-	RpcStringFreeA(&str);
-	return s;
-#else
-	char str[64] = { 0 };
-	uuid_t uuid;
-	uuid_generate_random(uuid);
-	uuid_unparse(uuid, str);
-	return str;
-#endif
-}

common/uuid.h

@@ -1,27 +0,0 @@
-/*
-	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2014 EQEMu Development Team (http://eqemulator.net)
-	
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-	
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#ifndef COMMON_UUID_H
-#define COMMON_UUID_H
-
-#include <string>
-
-std::string CreateUUID();
-
-#endif
-

common/version.h

@@ -30,7 +30,7 @@
 	Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
 */
 
-#define CURRENT_BINARY_DATABASE_VERSION 9097
+#define CURRENT_BINARY_DATABASE_VERSION 9100
 #ifdef BOTS
 	#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9008
 #else

common/web_interface_utils.cpp

@@ -1,77 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-Copyright (C) 2001-2014 EQEMu Development Team (http://eqemulator.net)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY except by those people which sell it, which
-are required to give you total support for your newly bought product;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#include "../common/global_define.h"
-#include "web_interface_utils.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/stringbuffer.h"
-#include <iostream>
-#include <sstream>
-#include <vector>
-#include <utility>
-
-
-using namespace rapidjson;
-using namespace std;
-
-std::vector<std::string> explode_string(std::string const & s, char delim)
-{
-	std::vector<std::string> result;
-	std::istringstream iss(s);
-
-	for (std::string token; std::getline(iss, token, delim);)
-	{
-		result.push_back(std::move(token));
-	}
-
-	return result;
-}
-
-std::string MakeJSON(std::string json)
-{
-	StringBuffer s;
-	Writer<StringBuffer> writer(s);
-	writer.StartObject();
-
-	auto arg_c = explode_string(json, ',');
-	if (arg_c.size() == 0)
-	{
-		auto arg_v = explode_string(json, ':');
-		if (arg_v.size() > 0)
-		{
-			for (int j = 0; j < arg_v.size(); j++)
-			{
-				writer.String(arg_v[j].c_str());
-			}
-		}
-	}
-	else
-	{
-		for (int i = 0; i < arg_c.size(); i++)
-		{
-			auto arg_v = explode_string(arg_c[i], ':');
-			for (int j = 0; j < arg_v.size(); j++)
-			{
-				writer.String(arg_v[j].c_str());
-			}
-		}
-	}
-
-	writer.EndObject();
-	return s.GetString();
-}

common/web_interface_utils.h

@@ -1,33 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-Copyright (C) 2001-2014 EQEMu Development Team (http://eqemulator.net)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY except by those people which sell it, which
-are required to give you total support for your newly bought product;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#ifndef COMMON_WEBINTUTIL_H
-#define COMMON_WEBINTUTIL_H
-
-#include "../common/global_define.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/stringbuffer.h"
-#include <iostream>
-#include <sstream>
-#include <vector>
-#include <utility>
-
-std::vector<std::string> explode_string(std::string const & s, char delim);
-std::string MakeJSON(std::string json);
-
-#endif
-

dependencies/.gitignore

@@ -1,9 +1,2 @@
-boost/
-luaj_x86/
-luaj_x64/
-mysql_x86/
-mysql_x64/
-zlib_x86/
-zlib_x64/
-cyassl/
-websocketpp/
+*.*
+*

dependencies/CMakeLists.txt

@@ -1,7 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
-IF(EQEMU_BUILD_LUA)
-	ADD_SUBDIRECTORY(luabind)
-ENDIF(EQEMU_BUILD_LUA)
-
-ADD_SUBDIRECTORY(libwebsockets)

dependencies/libwebsockets/.gitignore

@@ -1,38 +0,0 @@
-#Ignore build files
-Makefile
-config.h
-config.log
-config.status
-libtool
-stamp-h1
-output/
-win32port/ipch/
-win32port/Debug*/
-win32port/Release*/
-win32port/server/Debug*/
-win32port/server/Release*/
-win32port/client/Debug*/
-win32port/client/Release*/
-win32port/libwebsocketswin32/Debug*/
-win32port/libwebsocketswin32/Release*/
-win32port/zlib/Debug*/
-win32port/zlib/Release*/
-*.vcxproj.user
-*.opensdf
-*.sdf
-*.suo
-*.su
-*.m4
-missing
-depcomp
-install-sh
-configure
-compile
-config.guess
-*~
-*.orig
-autom4te.cache/
-ltmain.sh
-config.sub
-ar-lib
-libwebsockets.pc

dependencies/libwebsockets/Android.mk

@@ -1,29 +0,0 @@
-# example Android Native Library makefile
-# contributed by Gregory Junker <ggjunker@gmail.com>
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := libwebsockets
-LOCAL_CFLAGS    := -DLWS_BUILTIN_GETIFADDRS
-LWS_LIB_PATH	:= ../../../shared/libwebsockets/lib
-LOCAL_C_INCLUDES:= $(LOCAL_PATH)/$(LWS_LIB_PATH)
-LOCAL_SRC_FILES := \
-	$(LWS_LIB_PATH)/base64-decode.c \
-	$(LWS_LIB_PATH)/client.c \
-	$(LWS_LIB_PATH)/client-handshake.c \
-	$(LWS_LIB_PATH)/client-parser.c \
-	$(LWS_LIB_PATH)/daemonize.c \
-	$(LWS_LIB_PATH)/extension.c \
-	$(LWS_LIB_PATH)/extension-deflate-frame.c \
-	$(LWS_LIB_PATH)/extension-deflate-stream.c \
-	$(LWS_LIB_PATH)/getifaddrs.c \
-	$(LWS_LIB_PATH)/handshake.c \
-	$(LWS_LIB_PATH)/libwebsockets.c \
-	$(LWS_LIB_PATH)/md5.c \
-	$(LWS_LIB_PATH)/output.c \
-	$(LWS_LIB_PATH)/parsers.c \
-	$(LWS_LIB_PATH)/sha-1.c
-
-include $(BUILD_STATIC_LIBRARY)

dependencies/libwebsockets/CMakeLists.txt

@@ -1,927 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-
-if(POLICY CMP0046)
-	cmake_policy(VERSION 2.8)
-	# The new policy for add_dependencies is to now error if a dependency target
-	# is not found. The old policy didn't care and continued through configuration
-	cmake_policy(SET CMP0046 OLD)
-endif()
-
-project(libwebsockets)
-
-set(PACKAGE "libwebsockets")
-set(CPACK_PACKAGE_NAME "${PACKAGE}")
-set(CPACK_PACKAGE_VERSION_MAJOR "1")
-set(CPACK_PACKAGE_VERSION_MINOR "3")
-set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
-set(CPACK_PACKAGE_VENDOR "andy@warmcat.com")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PACKAGE} ${PACKAGE_VERSION}")
-set(SOVERSION "4.0.0")
-set(CPACK_SOURCE_GENERATOR "TGZ")
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
-set(VERSION "${CPACK_PACKAGE_VERSION}")
-
-set(LWS_LIBRARY_VERSION ${CPACK_PACKAGE_VERSION})
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
-
-message(STATUS "CMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'")
-
-# Try to find the current Git hash.
-find_package(Git)
-if(GIT_EXECUTABLE)
-	execute_process(
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    COMMAND "${GIT_EXECUTABLE}" log -n 1 --pretty=%h
-    OUTPUT_VARIABLE GIT_HASH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-
-    set(LWS_BUILD_HASH ${GIT_HASH})
-    message("Git commit hash: ${LWS_BUILD_HASH}")
-endif()
-
-option(LWS_WITH_SSL "Include SSL support (default OpenSSL, CyaSSL if LWS_USE_CYASSL is set)" OFF)
-option(LWS_SSL_CLIENT_USE_OS_CA_CERTS "SSL support should make use of OS installed CA root certs" ON)
-option(LWS_USE_EXTERNAL_ZLIB "Search the system for ZLib instead of using the included one (on Windows)" OFF)
-option(LWS_USE_CYASSL "Use CyaSSL replacement for OpenSSL. When settings this, you also need to specify LWS_CYASSL_LIB and LWS_CYASSL_INCLUDE_DIRS" OFF)
-option(LWS_WITHOUT_BUILTIN_GETIFADDRS "Don't use BSD getifaddrs implementation from libwebsockets if it is missing (this will result in a compilation error) ... Default is your libc provides it. On some systems such as uclibc it doesn't exist." OFF)
-option(LWS_WITHOUT_CLIENT "Don't build the client part of the library" ON)
-option(LWS_WITHOUT_SERVER "Don't build the server part of the library" OFF)
-option(LWS_LINK_TESTAPPS_DYNAMIC "Link the test apps to the shared version of the library. Default is to link statically" ON)
-option(LWS_WITHOUT_TESTAPPS "Don't build the libwebsocket-test-apps" ON)
-option(LWS_WITHOUT_TEST_SERVER "Don't build the test server" ON)
-option(LWS_WITHOUT_TEST_SERVER_EXTPOLL "Don't build the test server version that uses external poll" ON)
-option(LWS_WITHOUT_TEST_PING "Don't build the ping test application" ON)
-option(LWS_WITHOUT_TEST_CLIENT "Don't build the client test application" ON)
-option(LWS_WITHOUT_TEST_FRAGGLE "Don't build the ping test application" ON)
-option(LWS_WITHOUT_DEBUG "Don't compile debug related code" OFF)
-option(LWS_WITHOUT_EXTENSIONS "Don't compile with extensions" OFF)
-option(LWS_WITH_LATENCY "Build latency measuring code into the library" OFF)
-option(LWS_WITHOUT_DAEMONIZE "Don't build the daemonization api" OFF)
-option(LWS_WITH_LIBEV "Compile with support for libev" OFF)
-option(LWS_IPV6 "Compile with support for ipv6" ON)
-option(LWS_WITH_HTTP2 "Compile with support for http2" OFF)
-
-# Allow the user to override installation directories.
-set(LWS_INSTALL_LIB_DIR       lib CACHE PATH "Installation directory for libraries")
-set(LWS_INSTALL_BIN_DIR       "." CACHE PATH "Installation directory for executables")
-set(LWS_INSTALL_INCLUDE_DIR   include CACHE PATH "Installation directory for header files")
-set(LWS_INSTALL_EXAMPLES_DIR  "." CACHE PATH "Installation directory for example files")
-
-if (LWS_WITHOUT_CLIENT AND LWS_WITHOUT_SERVER)
-	message(FATAL_ERROR "Makes no sense to compile without both client or server.")
-endif()
-
-# The base dir where the test-apps look for the SSL certs.
-set(LWS_OPENSSL_CLIENT_CERTS ../share CACHE PATH "Server SSL certificate directory")
-if (WIN32)
-	set(LWS_OPENSSL_CLIENT_CERTS . CACHE PATH "Client SSL certificate directory")
-
-	if (LWS_IPV6)
-		set(LWS_IPV6 OFF)
-		message(WARNING "IPv6 does currently not work on Windows!")
-	endif()
-else()
-	set(LWS_OPENSSL_CLIENT_CERTS /etc/pki/tls/certs/ CACHE PATH "Client SSL certificate directory")
-endif()
-
-set(LWS_CYASSL_LIB CACHE PATH "Path to the CyaSSL library")
-set(LWS_CYASSL_INCLUDE_DIRS CACHE PATH "Path to the CyaSSL include directory")
-
-if (LWS_USE_CYASSL)
-	if ("${LWS_CYASSL_LIB}" STREQUAL "" OR "${LWS_CYASSL_INCLUDE_DIRS}" STREQUAL "")
-		message(FATAL_ERROR "You must set LWS_CYASSL_LIB and LWS_CYASSL_INCLUDE_DIRS when LWS_USE_CYASSL is turned on")
-	endif()
-	set(USE_CYASSL 1)
-endif()
-
-if (LWS_WITHOUT_EXTENSIONS)
-	set(LWS_NO_EXTENSIONS 1)
-endif()
-
-if (LWS_WITH_SSL)
-	set(LWS_OPENSSL_SUPPORT 1)
-endif()
-
-if (LWS_SSL_CLIENT_USE_OS_CA_CERTS)
-	set(LWS_SSL_CLIENT_USE_OS_CA_CERTS 1)
-endif()
-
-if (LWS_WITH_LATENCY)
-	set(LWS_LATENCY 1)
-endif()
-
-if (LWS_WITHOUT_DAEMONIZE OR WIN32)
-	set(LWS_NO_DAEMONIZE 1)
-endif()
-
-if (LWS_WITHOUT_SERVER)
-	set(LWS_NO_SERVER 1)
-endif()
-
-if (LWS_WITHOUT_CLIENT)
-	set(LWS_NO_CLIENT 1)
-endif()
-
-if (LWS_WITHOUT_DEBUG)
-	set(_DEBUG 0)
-else()
-	set(_DEBUG 1)
-endif()
-
-if (LWS_WITH_LIBEV)
-	set(LWS_USE_LIBEV 1)
-	set(LWS_NO_EXTERNAL_POLL 1)
-endif()
-
-if (LWS_IPV6)
-	set(LWS_USE_IPV6 1)
-endif()
-
-if (LWS_WITH_HTTP2)
-	set(LWS_USE_HTTP2 1)
-endif()
-
-if (MINGW)
-	set(LWS_MINGW_SUPPORT 1)
-endif()
-
-include_directories("${PROJECT_BINARY_DIR}")
-
-include(CheckCSourceCompiles)
-
-# Check for different inline keyword versions.
-foreach(KEYWORD "inline" "__inline__" "__inline")
-	set(CMAKE_REQUIRED_DEFINITIONS "-DKEYWORD=${KEYWORD}")
-	CHECK_C_SOURCE_COMPILES(
-		"
-		#include <stdio.h>
-		KEYWORD void a() {}
-		int main(int argc, char **argv) { a(); return 0; }
-		" HAVE_${KEYWORD})
-endforeach()
-
-if (NOT HAVE_inline)
-	if (HAVE___inline__)
-		set(inline __inline__)
-	elseif(HAVE___inline)
-		set(inline __inline)
-	endif()
-endif()
-
-# Put the libaries and binaries that get built into directories at the
-# top of the build tree rather than in hard-to-find leaf directories. 
-SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
-SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
-SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
-
-# Put absolute path of dynamic libraries into the object code. Some
-# architectures, notably Mac OS X, need this.
-SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LWS_INSTALL_LIB_DIR}${LIB_SUFFIX}")
-
-# So we can include the CMake generated config file only when
-# building with CMAKE.
-add_definitions(-DCMAKE_BUILD)
-
-include(CheckFunctionExists)
-include(CheckIncludeFile)
-include(CheckIncludeFiles)
-include(CheckLibraryExists)
-include(CheckTypeSize)
-
-CHECK_FUNCTION_EXISTS(bzero HAVE_BZERO)
-CHECK_FUNCTION_EXISTS(fork HAVE_FORK)
-CHECK_FUNCTION_EXISTS(getenv HAVE_GETENV)
-CHECK_FUNCTION_EXISTS(malloc HAVE_MALLOC)
-CHECK_FUNCTION_EXISTS(memset HAVE_MEMSET)
-CHECK_FUNCTION_EXISTS(realloc HAVE_REALLOC)
-CHECK_FUNCTION_EXISTS(socket HAVE_SOCKET)
-CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR)
-CHECK_FUNCTION_EXISTS(vfork HAVE_VFORK)
-CHECK_FUNCTION_EXISTS(getifaddrs HAVE_GETIFADDRS)
-
-if (NOT HAVE_GETIFADDRS)
-	if (LWS_WITHOUT_BUILTIN_GETIFADDRS)
-		message(FATAL_ERROR "No getifaddrs was found on the system. Turn off the LWS_WITHOUT_BUILTIN_GETIFADDRS compile option to use the supplied BSD version.")
-	endif()
-
-	set(LWS_BUILTIN_GETIFADDRS 1)
-endif()
-
-CHECK_INCLUDE_FILE(dlfcn.h HAVE_DLFCN_H)
-CHECK_INCLUDE_FILE(fcntl.h HAVE_FCNTL_H)
-CHECK_INCLUDE_FILE(in6addr.h HAVE_IN6ADDR_H)
-CHECK_INCLUDE_FILE(inttypes.h HAVE_INTTYPES_H)
-CHECK_INCLUDE_FILE(memory.h HAVE_MEMORY_H)
-CHECK_INCLUDE_FILE(netinet/in.h HAVE_NETINET_IN_H)
-CHECK_INCLUDE_FILE(stdint.h HAVE_STDINT_H)
-CHECK_INCLUDE_FILE(stdlib.h HAVE_STDLIB_H)
-CHECK_INCLUDE_FILE(strings.h HAVE_STRINGS_H)
-CHECK_INCLUDE_FILE(string.h HAVE_STRING_H)
-CHECK_INCLUDE_FILE(sys/prctl.h HAVE_SYS_PRCTL_H)
-CHECK_INCLUDE_FILE(sys/socket.h HAVE_SYS_SOCKET_H)
-CHECK_INCLUDE_FILE(sys/stat.h HAVE_SYS_STAT_H)
-CHECK_INCLUDE_FILE(sys/types.h HAVE_SYS_TYPES_H)
-CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
-CHECK_INCLUDE_FILE(vfork.h HAVE_VFORK_H)
-CHECK_INCLUDE_FILE(zlib.h HAVE_ZLIB_H)
-
-# TODO: These can be tested if they actually work also...
-set(HAVE_WORKING_FORK HAVE_FORK)
-set(HAVE_WORKING_VFORK HAVE_VFORK)
-
-CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
-
-CHECK_TYPE_SIZE(pid_t PID_T_SIZE)
-CHECK_TYPE_SIZE(size_t SIZE_T_SIZE)
-
-if (NOT PID_T_SIZE)
-	set(pid_t int)
-endif()
-
-if (NOT SIZE_T_SIZE)
-	set(size_t "unsigned int")
-endif()
-
-if (NOT HAVE_MALLOC)
-	set(malloc rpl_malloc)
-endif()
-
-if (NOT HAVE_REALLOC)
-	set(realloc rpl_realloc)
-endif()
-
-# Generate the config.h that includes all the compilation settings.
-configure_file(
-       "${PROJECT_SOURCE_DIR}/config.h.cmake"
-       "${PROJECT_BINARY_DIR}/lws_config.h")
-
-if (MSVC)
-	# Turn off stupid microsoft security warnings.
-	add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
-endif(MSVC)
-
-include_directories("${PROJECT_SOURCE_DIR}/lib")
-
-# Group headers and sources.
-# Some IDEs use this for nicer file structure.
-set(HDR_PRIVATE
-	lib/private-libwebsockets.h
-	"${PROJECT_BINARY_DIR}/lws_config.h"
-	)
-
-set(HDR_PUBLIC	
-	"${PROJECT_SOURCE_DIR}/lib/libwebsockets.h"
-	)
-
-set(SOURCES
-	lib/base64-decode.c
-	lib/handshake.c
-	lib/libwebsockets.c
-	lib/service.c
-	lib/pollfd.c
-	lib/output.c
-	lib/parsers.c
-	lib/context.c
-	lib/sha-1.c
-	)
-
-if (NOT LWS_WITHOUT_CLIENT)
-	list(APPEND SOURCES
-		lib/client.c
-		lib/client-handshake.c
-		lib/client-parser.c
-		)
-endif()
-
-if (LWS_WITH_SSL)
-	list(APPEND SOURCES
-		lib/ssl.c
-		)
-endif()
-
-if (LWS_WITH_HTTP2)
-	list(APPEND SOURCES
-		lib/ssl-http2.c
-		)
-endif()
-# select the active platform files
-
-if (WIN32)
-	list(APPEND SOURCES
-		lib/lws-plat-win.c
-		)
-else()
-	list(APPEND SOURCES
-		lib/lws-plat-unix.c
-		)
-endif()
-
-if (NOT LWS_WITHOUT_SERVER)
-	list(APPEND SOURCES
-		lib/server.c
-		lib/server-handshake.c
-		)
-endif()
-
-if (NOT LWS_WITHOUT_EXTENSIONS)
-	list(APPEND HDR_PRIVATE
-		lib/extension-deflate-frame.h
-		lib/extension-deflate-stream.h
-		)
-
-	list(APPEND SOURCES
-		lib/extension.c
-		lib/extension-deflate-frame.c
-		lib/extension-deflate-stream.c
-		)
-endif()
-
-if (LWS_WITH_LIBEV)
-	list(APPEND SOURCES
-		lib/libev.c
-		)
-endif(LWS_WITH_LIBEV)
-
-# Add helper files for Windows.
-if (WIN32)
-	set(WIN32_HELPERS_PATH win32port/win32helpers)
-	include_directories(${WIN32_HELPERS_PATH})
-else(WIN32)
-	# Unix.
-	if (NOT LWS_WITHOUT_DAEMONIZE)
-		list(APPEND SOURCES
-			lib/daemonize.c
-			)
-	endif()
-endif(WIN32)
-
-if (UNIX)
-	if (NOT HAVE_GETIFADDRS)
-		list(APPEND HDR_PRIVATE lib/getifaddrs.h)
-		list(APPEND SOURCES lib/getifaddrs.c)
-	endif()
-endif(UNIX)
-
-
-if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-    if (UNIX)
-	set( CMAKE_C_FLAGS "-Wall -Werror -O4 -fvisibility=hidden ${CMAKE_C_FLAGS}" )
-    else(UNIX)
-	set( CMAKE_C_FLAGS "-Wall -O4 -fvisibility=hidden ${CMAKE_C_FLAGS}" )
-    endif(UNIX)
-endif ()
-
-source_group("Headers Private"  FILES ${HDR_PRIVATE})
-source_group("Headers Public"   FILES ${HDR_PUBLIC})
-source_group("Sources"          FILES ${SOURCES})
-
-#
-# Create the lib.
-#
-add_library(websockets STATIC
-			${HDR_PRIVATE}
-			${HDR_PUBLIC}
-			${SOURCES})
-add_library(websockets_shared SHARED
-			${HDR_PRIVATE}
-			${HDR_PUBLIC}
-			${SOURCES})
-
-if (WIN32)
-	# On Windows libs have the same file ending (.lib)
-	# for both static and shared libraries, so we
-	# need a unique name for the static one.
-	set_target_properties(websockets 
-		PROPERTIES
-		OUTPUT_NAME websockets_static)
-
-	# Compile as DLL (export function declarations)
-	set_property(
-		TARGET websockets_shared
-		PROPERTY COMPILE_DEFINITIONS 
-		LWS_DLL
-		LWS_INTERNAL
-		)
-endif(WIN32)
-
-# We want the shared lib to be named "libwebsockets"
-# not "libwebsocket_shared".
-set_target_properties(websockets_shared
-		PROPERTIES 
-		OUTPUT_NAME websockets)
-
-# Set the so version of the lib.
-# Equivalent to LDFLAGS=-version-info x:x:x
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-	foreach(lib websockets websockets_shared)
-		set_target_properties(${lib} 
-			PROPERTIES
-			SOVERSION ${SOVERSION})
-	endforeach()
-endif()
-
-set(LIB_LIST)
-
-#
-# Find libraries.
-#
-
-#
-# ZLIB (Only needed for deflate extensions).
-#
-if (NOT LWS_WITHOUT_EXTENSIONS)
-	if (WIN32 AND NOT LWS_USE_EXTERNAL_ZLIB)
-		message("Using included Zlib version")
-
-		# Compile ZLib if needed.
-		set(WIN32_ZLIB_PATH "win32port/zlib")
-		set(ZLIB_SRCS
-			${WIN32_ZLIB_PATH}/adler32.c
-			${WIN32_ZLIB_PATH}/compress.c
-			${WIN32_ZLIB_PATH}/crc32.c
-			${WIN32_ZLIB_PATH}/deflate.c
-			${WIN32_ZLIB_PATH}/gzclose.c
-			${WIN32_ZLIB_PATH}/gzio.c
-			${WIN32_ZLIB_PATH}/gzlib.c
-			${WIN32_ZLIB_PATH}/gzread.c
-			${WIN32_ZLIB_PATH}/gzwrite.c
-			${WIN32_ZLIB_PATH}/infback.c
-			${WIN32_ZLIB_PATH}/inffast.c
-			${WIN32_ZLIB_PATH}/inflate.c
-			${WIN32_ZLIB_PATH}/inftrees.c
-			${WIN32_ZLIB_PATH}/trees.c
-			${WIN32_ZLIB_PATH}/uncompr.c
-			${WIN32_ZLIB_PATH}/zutil.c
-		)
-
-		# Create the library.
-		add_library(ZLIB STATIC ${ZLIB_SRCS})
-
-		# Set the same variables as find_package would.
-		set(ZLIB_INCLUDE_DIRS ${WIN32_ZLIB_PATH})
-		if(POLICY CMP0026)
-			cmake_policy(VERSION 2.8)
-			# The new policy for add_dependencies is to now error if a dependency target
-			# is not found. The old policy didn't care and continued through configuration
-			cmake_policy(SET CMP0026 OLD)
-		endif()
-		get_property(ZLIB_LIBRARIES TARGET ZLIB PROPERTY LOCATION)
-		set(ZLIB_FOUND 1)
-	else()
-		find_package(ZLIB REQUIRED)
-	endif()
-
-	# Make sure ZLib is compiled before the libs.
-	foreach (lib websockets websockets_shared)
-		add_dependencies(${lib} ZLIB)
-	endforeach()
-
-	message(STATUS "ZLib include dirs: ${ZLIB_INCLUDE_DIRS}")
-	message(STATUS "ZLib libraries: ${ZLIB_LIBRARIES}")
-	include_directories(${ZLIB_INCLUDE_DIRS})
-	list(APPEND LIB_LIST ${ZLIB_LIBRARIES})
-endif(NOT LWS_WITHOUT_EXTENSIONS)
-
-#
-# OpenSSL
-#
-if (LWS_WITH_SSL)
-	message("Compiling with SSL support")
-
-	if (LWS_USE_CYASSL)
-		# Use CyaSSL as OpenSSL replacement.
-		# TODO: Add a find_package command for this also.
-		message("CyaSSL include dir: ${LWS_CYASSL_INCLUDE_DIRS}")
-		message("CyaSSL libraries: ${LWS_CYASSL_LIB}")
-
-		# Additional to the root directory we need to include
-		# the cyassl/ subdirectory which contains the OpenSSL
-		# compatability layer headers.
-		foreach(inc ${LWS_CYASSL_INCLUDE_DIRS})
-			include_directories("${inc}" "${inc}/cyassl")
-		endforeach()
-
-		list(APPEND LIB_LIST "${LWS_CYASSL_LIB}")
-	else()
-		# TODO: Add support for STATIC also.
-		find_package(OpenSSL REQUIRED)
-
-		message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}")
-		message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")
-
-		include_directories("${OPENSSL_INCLUDE_DIR}")
-		list(APPEND LIB_LIST ${OPENSSL_LIBRARIES})
-
-		# Link against dynamic linking functions.
-		# (Don't link directly to libdl since it is not needed on all platforms, it's now a part of libc).
-		list(APPEND LIB_LIST ${CMAKE_DL_LIBS})
-	endif()
-endif(LWS_WITH_SSL)
-
-if (LWS_WITH_LIBEV)
-	list(APPEND LIB_LIST "ev")
-endif(LWS_WITH_LIBEV)
-
-#
-# Platform specific libs.
-#
-if (WINCE)
-	list(APPEND LIB_LIST ws2.lib)
-elseif (WIN32)
-	list(APPEND LIB_LIST ws2_32.lib)
-endif()
-
-if (UNIX)
-	list(APPEND LIB_LIST m)
-endif()
-
-# Setup the linking for all libs.
-foreach (lib websockets websockets_shared)
-	target_link_libraries(${lib} ${LIB_LIST})
-endforeach()
-
-#
-# Test applications
-#
-set(TEST_APP_LIST)
-if (NOT LWS_WITHOUT_TESTAPPS)
-	#
-	# Helper function for adding a test app.
-	#
-	macro(create_test_app TEST_NAME MAIN_SRC)
-		
-		set(TEST_SRCS ${MAIN_SRC})
-		set(TEST_HDR)
-
-		if (WIN32)
-			list(APPEND TEST_SRCS 
-				${WIN32_HELPERS_PATH}/getopt.c
-				${WIN32_HELPERS_PATH}/getopt_long.c
-				${WIN32_HELPERS_PATH}/gettimeofday.c
-			)
-
-			list(APPEND TEST_HDR 
-				${WIN32_HELPERS_PATH}/getopt.h
-				${WIN32_HELPERS_PATH}/gettimeofday.h
-			)
-		endif(WIN32)
-
-		source_group("Headers Private"   FILES ${TEST_HDR})
-		source_group("Sources"   FILES ${TEST_SRCS})
-		add_executable(${TEST_NAME} ${TEST_SRCS} ${TEST_HDR})
-		
-		if (LWS_LINK_TESTAPPS_DYNAMIC)
-			target_link_libraries(${TEST_NAME} websockets_shared)
-			add_dependencies(${TEST_NAME} websockets_shared)
-		else(LWS_LINK_TESTAPPS_DYNAMIC)
-			target_link_libraries(${TEST_NAME} websockets)
-			add_dependencies(${TEST_NAME} websockets)
-		endif(LWS_LINK_TESTAPPS_DYNAMIC)
-
-		# Set test app specific defines.
-		set_property(TARGET ${TEST_NAME}
-					PROPERTY COMPILE_DEFINITIONS 
-						INSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share"
-					)
-
-		# Prefix the binary names with libwebsockets.
-		set_target_properties(${TEST_NAME} 
-			PROPERTIES
-			OUTPUT_NAME libwebsockets-${TEST_NAME})
-
-		# Add to the list of tests.
-		list(APPEND TEST_APP_LIST ${TEST_NAME})
-	endmacro()
-
-	if (LWS_WITH_SSL AND NOT LWS_USE_CYASSL)
-		message("Searching for OpenSSL executable and dlls")
-		find_package(OpenSSLbins)
-		message("OpenSSL executable: ${OPENSSL_EXECUTABLE}")
-	endif()
-
-	if (NOT LWS_WITHOUT_SERVER)
-		#
-		# test-server
-		#
-		if (NOT LWS_WITHOUT_TEST_SERVER)
-			create_test_app(test-server "test-server/test-server.c")
-		endif()
-
-		#
-		# test-server-extpoll
-		#
-		if (NOT LWS_WITHOUT_TEST_SERVER_EXTPOLL)
-			create_test_app(test-server-extpoll "test-server/test-server.c")
-			# Set defines for this executable only.
-			set_property(
-				TARGET test-server-extpoll
-				PROPERTY COMPILE_DEFINITIONS 
-					EXTERNAL_POLL 
-					INSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share"
-				)
-
-			# We need to link against winsock code.
-			if (WIN32)
-				target_link_libraries(test-server-extpoll ws2_32.lib)
-			endif(WIN32)
-		endif()
-
-		# Data files for running the test server.
-		set(TEST_SERVER_DATA
-			"${PROJECT_SOURCE_DIR}/test-server/favicon.ico"
-			"${PROJECT_SOURCE_DIR}/test-server/leaf.jpg"
-			"${PROJECT_SOURCE_DIR}/test-server/libwebsockets.org-logo.png"
-			"${PROJECT_SOURCE_DIR}/test-server/test.html")
-
-		# Generate self-signed SSL certs for the test-server.
-		if (LWS_WITH_SSL AND OPENSSL_EXECUTABLE AND NOT LWS_WITHOUT_TEST_SERVER)
-			message("Generating SSL Certificates for the test-server...")
-
-			set(TEST_SERVER_SSL_KEY "${PROJECT_BINARY_DIR}/libwebsockets-test-server.key.pem")
-			set(TEST_SERVER_SSL_CERT "${PROJECT_BINARY_DIR}/libwebsockets-test-server.pem")
-
-			if (WIN32)
-				file(WRITE "${PROJECT_BINARY_DIR}/openssl_input.txt"
-					"GB\n"
-					"Erewhon\n"
-					"All around\n"
-					"libwebsockets-test\n"
-					"localhost\n"
-					"none@invalid.org\n\n"
-					)
-
-				# The "type" command is a bit picky with paths.
-				file(TO_NATIVE_PATH "${PROJECT_BINARY_DIR}/openssl_input.txt" OPENSSL_INPUT_WIN_PATH)
-				message("OPENSSL_INPUT_WIN_PATH = ${OPENSSL_INPUT_WIN_PATH}")
-				message("cmd = \"${OPENSSL_EXECUTABLE}\" req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout \"${TEST_SERVER_SSL_KEY}\" -out \"${TEST_SERVER_SSL_CERT}\"")
-
-				execute_process(
-					COMMAND cmd /c type "${OPENSSL_INPUT_WIN_PATH}"
-					COMMAND "${OPENSSL_EXECUTABLE}" req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}"
-					RESULT_VARIABLE OPENSSL_RETURN_CODE)
-
-				message("\n")
-
-				if (OPENSSL_RETURN_CODE)
-					message(WARNING "!!! Failed to generate SSL certificate for Test Server using cmd.exe !!!:\nOpenSSL return code = ${OPENSSL_RETURN_CODE}")
-				else()
-					message("SUCCSESFULLY generated SSL certificate")
-				endif()
-			else()
-				# Unix.
-				execute_process(
-					COMMAND printf "GB\\nErewhon\\nAll around\\nlibwebsockets-test\\n\\nlocalhost\\nnone@invalid.org\\n"
-					COMMAND "${OPENSSL_EXECUTABLE}"
-						req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}"
-					RESULT_VARIABLE OPENSSL_RETURN_CODE)
-
-				if (OPENSSL_RETURN_CODE)
-					message(WARNING "!!! Failed to generate SSL certificate for Test Server!!!:\nOpenSSL return code = ${OPENSSL_RETURN_CODE}")
-				else()
-					message("SUCCSESFULLY generated SSL certificate")
-				endif()
-			endif()
-
-			list(APPEND TEST_SERVER_DATA 
-				"${TEST_SERVER_SSL_KEY}"
-				"${TEST_SERVER_SSL_CERT}")
-		endif()
-
-		add_custom_command(TARGET test-server
-						POST_BUILD 
-						COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server")
-
-		# Copy the file needed to run the server so that the test apps can
-		# reach them from their default output location
-		foreach (TEST_FILE ${TEST_SERVER_DATA})
-			if (EXISTS ${TEST_FILE})
-				add_custom_command(TARGET test-server
-							POST_BUILD 
-							COMMAND "${CMAKE_COMMAND}" -E copy "${TEST_FILE}" "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server" VERBATIM)
-			endif()
-		endforeach()
-	endif(NOT LWS_WITHOUT_SERVER)
-
-	if (NOT LWS_WITHOUT_CLIENT)
-		#
-		# test-client
-		#
-		if (NOT LWS_WITHOUT_TEST_CLIENT)
-			create_test_app(test-client "test-server/test-client.c")
-		endif()
-
-		#
-		# test-fraggle
-		#
-		if (NOT LWS_WITHOUT_TEST_FRAGGLE)
-			create_test_app(test-fraggle "test-server/test-fraggle.c")
-		endif()
-
-		#
-		# test-ping
-		#
-		if (NOT LWS_WITHOUT_TEST_PING)
-			create_test_app(test-ping "test-server/test-ping.c")
-		endif()
-		#
-		# test-echo
-		#
-		if (NOT WITHOUT_TEST_ECHO)
-			create_test_app(test-echo "test-server/test-echo.c")
-		endif()
-
-	endif(NOT LWS_WITHOUT_CLIENT)
-
-	#
-	# Copy OpenSSL dlls to the output directory on Windows.
-	# (Otherwise we'll get an error when trying to run)
-	#
-	if (WIN32 AND LWS_WITH_SSL AND NOT LWS_USE_CYASSL)
-		if(OPENSSL_BIN_FOUND)
-			message("OpenSSL dlls found:")
-			message("  Libeay: ${LIBEAY_BIN}")
-			message("  SSLeay: ${SSLEAY_BIN}")
-
-			foreach(TARGET_BIN ${TEST_APP_LIST})			
-				add_custom_command(TARGET ${TARGET_BIN}
-					POST_BUILD 
-					COMMAND "${CMAKE_COMMAND}" -E copy "${LIBEAY_BIN}" "$<TARGET_FILE_DIR:${TARGET_BIN}>" VERBATIM)
-					
-				add_custom_command(TARGET ${TARGET_BIN}
-					POST_BUILD 
-					COMMAND "${CMAKE_COMMAND}" -E copy "${SSLEAY_BIN}" "$<TARGET_FILE_DIR:${TARGET_BIN}>" VERBATIM)
-			endforeach()
-		endif()
-	endif()
-endif(NOT LWS_WITHOUT_TESTAPPS)
-
-if (UNIX)
-	# Generate documentation.
-	# TODO: Fix this on Windows.
-	message("Generating API documentation")
-	file(GLOB C_FILES "${PROJECT_SOURCE_DIR}/lib/*.c")
-	execute_process(COMMAND "${CMAKE_COMMAND}" -E make_directory "${PROJECT_BINARY_DIR}/doc/")
-
-	execute_process(
-		COMMAND "${PROJECT_SOURCE_DIR}/scripts/kernel-doc" -html ${C_FILES} ${HDR_PUBLIC}
-		OUTPUT_FILE "${PROJECT_BINARY_DIR}/doc/libwebsockets-api-doc.html"
-		ERROR_QUIET)
-
-	execute_process(
-		COMMAND "${PROJECT_SOURCE_DIR}/scripts/kernel-doc" -text ${C_FILES} ${HDR_PUBLIC}
-		OUTPUT_FILE "${PROJECT_BINARY_DIR}/doc/libwebsockets-api-doc.txt"
-		ERROR_QUIET)
-
-# Generate and install pkgconfig.
-# (This is not indented, because the tabs will be part of the output)
-file(WRITE "${PROJECT_BINARY_DIR}/libwebsockets.pc"
-"prefix=\"${CMAKE_INSTALL_PREFIX}\"
-exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib${LIB_SUFFIX}
-includedir=\${prefix}/include
-
-Name: libwebsockets
-Description: Websockets server and client library
-Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
-
-Libs: -L\${libdir} -lwebsockets
-Cflags: -I\${includedir}"
-)
-
-	install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc"
-		DESTINATION lib${LIB_SUFFIX}/pkgconfig)
-endif(UNIX)
-
-#
-# Installation preparations.
-#
-
-if(WIN32 AND NOT CYGWIN)
-  set(DEF_INSTALL_CMAKE_DIR cmake)
-else()
-  set(DEF_INSTALL_CMAKE_DIR lib/cmake/libwebsockets)
-endif()
-
-set(LWS_INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
-
-# Export targets (This is used for other CMake projects to easily find the libraries and include files).
-export(TARGETS websockets websockets_shared
-        FILE "${PROJECT_BINARY_DIR}/LibwebsocketsTargets.cmake")
-export(PACKAGE libwebsockets)
-
-# Generate the config file for the build-tree.
-set(LWS__INCLUDE_DIRS 
-    "${PROJECT_SOURCE_DIR}/lib"
-    "${PROJECT_BINARY_DIR}")
-set(LIBWEBSOCKETS_INCLUDE_DIRS ${LWS__INCLUDE_DIRS} CACHE PATH "Libwebsockets include directories")
-configure_file(${PROJECT_SOURCE_DIR}/cmake/LibwebsocketsConfig.cmake.in
-                ${PROJECT_BINARY_DIR}/LibwebsocketsConfig.cmake 
-                @ONLY)
-
-# Generate the config file for the installation tree.
-get_filename_component(LWS_ABSOLUTE_INSTALL_CMAKE_DIR ${LWS_INSTALL_CMAKE_DIR} ABSOLUTE)
-get_filename_component(LWS_ABSOLUTE_INSTALL_INCLUDE_DIR ${LWS_INSTALL_INCLUDE_DIR} ABSOLUTE)
-file(RELATIVE_PATH 
-    REL_INCLUDE_DIR 
-    "${LWS_ABSOLUTE_INSTALL_CMAKE_DIR}"
-    "${LWS_ABSOLUTE_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from the cmake dir.
-
-# Note the EVENT_CMAKE_DIR is defined in JanssonConfig.cmake.in, 
-# we escape it here so it's evaluated when it is included instead
-# so that the include dirs are given relative to where the 
-# config file is located.
-set(LWS__INCLUDE_DIRS 
-    "\${LWS_CMAKE_DIR}/${REL_INCLUDE_DIR}") 
-configure_file(${PROJECT_SOURCE_DIR}/cmake/LibwebsocketsConfig.cmake.in
-                ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/LibwebsocketsConfig.cmake 
-                @ONLY)
-
-# Generate version info for both build-tree and install-tree.
-configure_file(${PROJECT_SOURCE_DIR}/cmake/LibwebsocketsConfigVersion.cmake.in
-                ${PROJECT_BINARY_DIR}/LibwebsocketsConfigVersion.cmake 
-                @ONLY)
-
-set_target_properties(websockets websockets_shared 
-					PROPERTIES PUBLIC_HEADER "${HDR_PUBLIC}")
-
-#
-# Installation.
-#
-
-# Install libs and headers.
-install(TARGETS websockets websockets_shared
-		EXPORT LibwebsocketsTargets
-		LIBRARY DESTINATION "${LWS_INSTALL_LIB_DIR}${LIB_SUFFIX}" COMPONENT libraries
-		ARCHIVE DESTINATION "${LWS_INSTALL_LIB_DIR}${LIB_SUFFIX}" COMPONENT libraries
-		RUNTIME DESTINATION "${LWS_INSTALL_BIN_DIR}" COMPONENT libraries # Windows DLLs
-		PUBLIC_HEADER DESTINATION "${LWS_INSTALL_INCLUDE_DIR}" COMPONENT dev)
-set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "Libraries")
-set(CPACK_COMPONENT_DEV_DISPLAY_NAME "Development files")
-
-# Install test apps.
-if (NOT LWS_WITHOUT_TESTAPPS AND NOT LWS_WITHOUT_CLIENT)
-	install(TARGETS test-client ${TEST_APP_LIST}
-			RUNTIME DESTINATION ${LWS_INSTALL_EXAMPLES_DIR}
-			COMPONENT examples)
-	set(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Example files")
-endif()
-
-# Programs shared files used by the test-server.
-if (NOT LWS_WITHOUT_TESTAPPS AND NOT LWS_WITHOUT_SERVER)
-	install(FILES ${TEST_SERVER_DATA}
-			DESTINATION share/libwebsockets-test-server
-			COMPONENT examples)
-endif()
-
-# Install exports for the install-tree.
-install(EXPORT LibwebsocketsTargets
-		DESTINATION "${LWS_INSTALL_CMAKE_DIR}" COMPONENT dev)
-
-# build subdir is not part of sources
-set(CPACK_SOURCE_IGNORE_FILES $(CPACK_SOURCE_IGNORE_FILES) ".git" "build" "tgz" "tar.gz")
-
-# Most people are more used to "make dist" compared to "make package_source"
-add_custom_target(dist COMMAND "${CMAKE_MAKE_PROGRAM}" package_source)
-
-include(UseRPMTools)
-if (RPMTools_FOUND)
-	RPMTools_ADD_RPM_TARGETS(libwebsockets libwebsockets.spec)
-endif()
-
-message("---------------------------------------------------------------------")
-message("  Settings:  (For more help do cmake -LH <srcpath>")
-message("---------------------------------------------------------------------")
-message(" LWS_WITH_SSL = ${LWS_WITH_SSL}  (SSL Support)")
-message(" LWS_SSL_CLIENT_USE_OS_CA_CERTS = ${LWS_SSL_CLIENT_USE_OS_CA_CERTS}")
-message(" LWS_USE_CYASSL = ${LWS_USE_CYASSL} (CyaSSL replacement for OpenSSL)")
-if (LWS_USE_CYASSL)
-	message("   LWS_CYASSL_LIB = ${LWS_CYASSL_LIB}")
-	message("   LWS_CYASSL_INCLUDE_DIRS = ${LWS_CYASSL_INCLUDE_DIRS}")
-endif()
-message(" LWS_WITHOUT_BUILTIN_GETIFADDRS = ${LWS_WITHOUT_BUILTIN_GETIFADDRS}")
-message(" LWS_WITHOUT_CLIENT = ${LWS_WITHOUT_CLIENT}")
-message(" LWS_WITHOUT_SERVER = ${LWS_WITHOUT_SERVER}")
-message(" LWS_LINK_TESTAPPS_DYNAMIC = ${LWS_LINK_TESTAPPS_DYNAMIC}")
-message(" LWS_WITHOUT_TESTAPPS = ${LWS_WITHOUT_TESTAPPS}")
-message(" LWS_WITHOUT_TEST_SERVER = ${LWS_WITHOUT_TEST_SERVER}")
-message(" LWS_WITHOUT_TEST_SERVER_EXTPOLL = ${LWS_WITHOUT_TEST_SERVER_EXTPOLL}")
-message(" LWS_WITHOUT_TEST_PING = ${LWS_WITHOUT_TEST_PING}")
-message(" LWS_WITHOUT_TEST_CLIENT = ${LWS_WITHOUT_TEST_CLIENT}")
-message(" LWS_WITHOUT_TEST_FRAGGLE = ${LWS_WITHOUT_TEST_FRAGGLE}")
-message(" LWS_WITHOUT_DEBUG = ${LWS_WITHOUT_DEBUG}")
-message(" LWS_WITHOUT_EXTENSIONS = ${LWS_WITHOUT_EXTENSIONS}")
-message(" LWS_WITH_LATENCY = ${LWS_WITH_LATENCY}")
-message(" LWS_WITHOUT_DAEMONIZE = ${LWS_WITHOUT_DAEMONIZE}")
-message(" LWS_USE_LIBEV = ${LWS_USE_LIBEV}")
-message(" LWS_IPV6 = ${LWS_IPV6}")
-message(" LWS_WITH_HTTP2 = ${LWS_WITH_HTTP2}")
-message("---------------------------------------------------------------------")
-
-# These will be available to parent projects including libwebsockets using add_subdirectory()
-set(LIBWEBSOCKETS_LIBRARIES websocket websockets_shared CACHE STRING "Libwebsocket libraries")
-set(LIBWEBSOCKETS_LIBRARIES_STATIC websocket CACHE STRING "Libwebsocket static library")
-set(LIBWEBSOCKETS_LIBRARIES_SHARED websockets_shared CACHE STRING "Libwebsocket shared library")
-
-# This must always be last!
-include(CPack)

dependencies/libwebsockets/LICENSE

@@ -1,526 +0,0 @@
-Libwebsockets and included programs are provided under the terms of the GNU
-Library General Public License (LGPL) 2.1, with the following exceptions:
-
-1) Static linking of programs with the libwebsockets library does not
-constitute a derivative work and does not require the author to provide 
-source code for the program, use the shared libwebsockets libraries, or
-link their program against a user-supplied version of libwebsockets.
-
-If you link the program to a modified version of libwebsockets, then the
-changes to libwebsockets must be provided under the terms of the LGPL in
-sections 1, 2, and 4.
-
-2) You do not have to provide a copy of the libwebsockets license with
-programs that are linked to the libwebsockets library, nor do you have to
-identify the libwebsockets license in your program or documentation as
-required by section 6 of the LGPL.
-
-However, programs must still identify their use of libwebsockets. The
-following example statement can be included in user documentation to
-satisfy this requirement:
-
-"[program] is based in part on the work of the libwebsockets  project
-(http://libwebsockets.org)"
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!

dependencies/libwebsockets/README

@@ -1,20 +0,0 @@
-This is the libwebsockets C library for lightweight websocket clients and
-servers.  For support, visit
-
- http://libwebsockets.org
-
-and consider joining the project mailing list at
-
- http://ml.libwebsockets.org/mailman/listinfo/libwebsockets
-
-You can get the latest version of the library from git
-
-http://git.libwebsockets.org
-https://github.com/warmcat/libwebsockets
-
-for more information:
-
-README.build      - information on building the library
-README.coding     - information for writing code using the library
-README.test-apps  - information about the test apps built with the library
-

dependencies/libwebsockets/README.build

@@ -1,225 +0,0 @@
-Introduction to CMake
----------------------
-
-CMake is a multi-platform build tool that can generate build files for many
-different target platforms. See more info at http://www.cmake.org
-
-CMake also allows/recommends you to do "out of source"-builds, that is, 
-the build files are separated from your sources, so there is no need to 
-create elaborate clean scripts to get a clean source tree, instead you 
-simply remove your build directory.
-
-Libwebsockets has been tested to build successfully on the following platforms
-with SSL support (both OpenSSL/CyaSSL):
-
-- Windows
-- Linux (x86 and ARM)
-- OSX
-- NetBSD
-
-Building the library and test apps
-----------------------------------
-
-The project settings used by CMake to generate the platform specific build
-files is called CMakeLists.txt. CMake then uses one of its "Generators" to
-output a Visual Studio project or Make file for instance. To see a list of
-the available generators for your platform, simply run the "cmake" command.
-
-Note that by default OpenSSL will be linked, if you don't want SSL support
-see below on how to toggle compile options.
-
-Building on Unix:
------------------
-
-1. Install CMake 2.6 or greater: http://cmake.org/cmake/resources/software.html
-   (Most Unix distributions comes with a packaged version also)
-
-2. Install OpenSSL.
-
-3. Generate the build files (default is Make files):
-
-	cd /path/to/src
-	mkdir build
-	cd build
-	cmake ..
-
-	(NOTE: The build/ directory can have any name and be located anywhere
-	 on your filesystem, and that the argument ".." given to cmake is simply
-	 the source directory of libwebsockets containing the CMakeLists.txt
-	 project file. All examples in this file assumes you use "..")
-
-	NOTE2
-	A common option you may want to give is to set the install path, same
-	as --prefix= with autotools.  It defaults to /usr/local.
-	You can do this by, eg
-
-	cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/usr
-
-	NOTE3
-	On machines that want libraries in lib64, you can also add the
-	following to the cmake line
-
-		-DLIB_SUFFIX=64
-		
-	NOTE4
-	If you are building against a non-distro OpenSSL (eg, in order to get
-	access to ALPN support only in newer OpenSSL versions) the nice way to
-	express that in one cmake command is eg,
-	
-		-DOPENSSL_ROOT_DIR=/usr/local/ssl
-
-4. Finally you can build using the generated Makefile:
-
-	make
-
-	
-Quirk of cmake
---------------
-
-When changing cmake options, for some reason the only way to get it to see the
-changes sometimes is delete the contents of your build directory and do the
-cmake from scratch.
-
-
-Building on Windows (Visual Studio)
------------------------------------
-1. Install CMake 2.6 or greater: http://cmake.org/cmake/resources/software.html
-
-2. Install OpenSSL binaries. http://www.openssl.org/related/binaries.html
-   (Preferably in the default location to make it easier for CMake to find them)
-
-3. Generate the Visual studio project by opening the Visual Studio cmd prompt:
-
-   cd <path to src>
-   md build
-   cd build
-   cmake -G "Visual Studio 10" ..
-
-   (NOTE: There is also a cmake-gui available on Windows if you prefer that)
-
-4. Now you should have a generated Visual Studio Solution in  your
-   <path to src>/build directory, which can be used to build.
-
-Setting compile options
------------------------
-
-To set compile time flags you can either use one of the CMake gui applications
-or do it via command line.
-
-Command line
-------------
-To list avaialable options (ommit the H if you don't want the help text):
-
-	cmake -LH ..
-
-Then to set an option and build (for example turn off SSL support):
-
-	cmake -DLWS_WITH_SSL=0 ..
-or
-	cmake -DLWS_WITH_SSL:BOOL=OFF ..
-
-Unix GUI
---------
-If you have a curses enabled build you simply type:
-(not all packages include this, my debian install does not for example).
-	
-	ccmake
-
-Windows GUI
------------
-On windows CMake comes with a gui application:
-	Start -> Programs -> CMake -> CMake (cmake-gui)
-
-CyaSSL replacement for OpenSSL
-------------------------------
-CyaSSL is a lightweight SSL library targeted at embedded system:
-http://www.yassl.com/yaSSL/Products-cyassl.html
-
-It contains a OpenSSL compatability layer which makes it possible to pretty
-much link to it instead of OpenSSL, giving a much smaller footprint.
-
-NOTE: cyassl needs to be compiled using the --enable-opensslextra flag for
-this to work.
-
-Compiling libwebsockets with CyaSSL
------------------------------------
-
-cmake .. -DLWS_USE_CYASSL=1 \
-	 -DLWS_CYASSL_INCLUDE_DIRS=/path/to/cyassl \
-	 -DLWS_CYASSL_LIB=/path/to/cyassl/cyassl.a ..
-
-NOTE: On windows use the .lib file extension for LWS_CYASSL_LIB instead.
-
-Cross compiling
----------------
-To enable cross compiling libwebsockets using CMake you need to create
-a "Toolchain file" that you supply to CMake when generating your build files.
-CMake will then use the cross compilers and build paths specified in this file
-to look for dependencies and such.
-
-Libwebsockets includes an example toolchain file cross-arm-linux-gnueabihf.cmake
-you can use as a starting point.
-
-The commandline to configure for cross with this would look like
-
-cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-	 -DCMAKE_TOOLCHAIN_FILE=../cross-arm-linux-gnueabihf.cmake \
-	 -DWITHOUT_EXTENSIONS=1 -DWITH_SSL=0
-
-The example shows how to build with no external cross lib dependencies, you
-need to proide the cross libraries otherwise.
-
-NOTE: start from an EMPTY build directory if you had a non-cross build in there
-	before the settings will be cached and your changes ignored.
-
-Additional information on cross compilation with CMake:
-	http://www.vtk.org/Wiki/CMake_Cross_Compiling
-
-
-Memory efficiency
------------------
-
-Embedded server-only configuration without extensions (ie, no compression
-on websocket connections), but with full v13 websocket features and http
-server, built on ARM Cortex-A9:
-
-Update at 8dac94d (2013-02-18)
-
-./configure --without-client --without-extensions --disable-debug --without-daemonize
-
-Context Creation, 1024 fd limit[2]:   16720 (includes 12 bytes per fd)
-Per-connection [3]:                      72 bytes, +1328 during headers
-
-.text	.rodata	.data	.bss
-11512	2784	288	4
-
-This shows the impact of the major configuration with/without options at
-13ba5bbc633ea962d46d using Ubuntu ARM on a PandaBoard ES.
-
-These are accounting for static allocations from the library elf, there are
-additional dynamic allocations via malloc.  These are a bit old now but give
-the right idea for relative "expense" of features.
-
-Static allocations, ARM9
-				.text	.rodata	.data	.bss
- All (no without)		35024	9940	336	4104
- without client			25684	7144	336	4104
- without client, exts		21652	6288	288	4104
- without client, exts, debug[1]	19756	3768	288	4104
- without server			30304	8160	336	4104
- without server, exts		25382	7204	288	4104
- without server, exts, debug[1]	23712	4256	288	4104
-
-[1] --disable-debug only removes messages below lwsl_notice.  Since that is
-the default logging level the impact is not noticable, error, warn and notice
-logs are all still there.
-
-[2] 1024 fd per process is the default limit (set by ulimit) in at least Fedora
-and Ubuntu.  You can make significant savings tailoring this to actual expected
-peak fds, ie, at a limit of 20, context creation allocation reduces to 4432 +
-240 = 4672)
-
-[3] known header content is freed after connection establishment
-
-
-

dependencies/libwebsockets/README.coding

@@ -1,267 +0,0 @@
-Daemonization
--------------
-
-There's a helper api lws_daemonize built by default that does everything you
-need to daemonize well, including creating a lock file.  If you're making
-what's basically a daemon, just call this early in your init to fork to a
-headless background process and exit the starting process.
-
-Notice stdout, stderr, stdin are all redirected to /dev/null to enforce your
-daemon is headless, so you'll need to sort out alternative logging, by, eg,
-syslog.
-
-
-Maximum number of connections
------------------------------
-
-The maximum number of connections the library can deal with is decided when
-it starts by querying the OS to find out how many file descriptors it is
-allowed to open (1024 on Fedora for example).  It then allocates arrays that
-allow up to that many connections, minus whatever other file descriptors are
-in use by the user code.
-
-If you want to restrict that allocation, or increase it, you can use ulimit or
-similar to change the avaiable number of file descriptors, and when restarted
-libwebsockets will adapt accordingly.
-
-
-Libwebsockets is singlethreaded
--------------------------------
-
-Directly performing websocket actions from other threads is not allowed.
-Aside from the internal data being inconsistent in forked() processes,
-the scope of a wsi (struct websocket) can end at any time during service
-with the socket closing and the wsi freed.
-
-Websocket write activities should only take place in the
-"LWS_CALLBACK_SERVER_WRITEABLE" callback as described below.
-
-Only live connections appear in the user callbacks, so this removes any
-possibility of trying to used closed and freed wsis.
-
-If you need to service other socket or file descriptors as well as the
-websocket ones, you can combine them together with the websocket ones
-in one poll loop, see "External Polling Loop support" below, and
-still do it all in one thread / process context.
-
-
-Only send data when socket writeable
-------------------------------------
-
-You should only send data on a websocket connection from the user callback
-"LWS_CALLBACK_SERVER_WRITEABLE" (or "LWS_CALLBACK_CLIENT_WRITEABLE" for
-clients).
-
-If you want to send something, do not just send it but request a callback
-when the socket is writeable using
-
- - libwebsocket_callback_on_writable(context, wsi) for a specific wsi, or
- - libwebsocket_callback_on_writable_all_protocol(protocol) for all connections
-using that protocol to get a callback when next writeable.
-
-Usually you will get called back immediately next time around the service
-loop, but if your peer is slow or temporarily inactive the callback will be
-delayed accordingly.  Generating what to write and sending it should be done
-in the ...WRITEABLE callback.
-
-See the test server code for an example of how to do this.
-
-
-Do not rely on only your own WRITEABLE requests appearing
----------------------------------------------------------
-
-Libwebsockets may generate additional LWS_CALLBACK_CLIENT_WRITEABLE events
-if it met network conditions where it had to buffer your send data internally.
-
-So your code for LWS_CALLBACK_CLIENT_WRITEABLE needs to own the decision
-about what to send, it can't assume that just because the writeable callback
-came it really is time to send something.
-
-It's quite possible you get an 'extra' writeable callback at any time and
-just need to return 0 and wait for the expected callback later.
-
-
-Closing connections from the user side
---------------------------------------
-
-When you want to close a connection, you do it by returning -1 from a
-callback for that connection.
-
-You can provoke a callback by calling libwebsocket_callback_on_writable on
-the wsi, then notice in the callback you want to close it and just return -1.
-But usually, the decision to close is made in a callback already and returning
--1 is simple.
-
-If the socket knows the connection is dead, because the peer closed or there
-was an affirmitive network error like a FIN coming, then libwebsockets  will
-take care of closing the connection automatically.
-
-If you have a silently dead connection, it's possible to enter a state where
-the send pipe on the connection is choked but no ack will ever come, so the
-dead connection will never become writeable.  To cover that, you can use TCP
-keepalives (see later in this document)
-
-
-Fragmented messages
--------------------
-
-To support fragmented messages you need to check for the final
-frame of a message with libwebsocket_is_final_fragment. This
-check can be combined with libwebsockets_remaining_packet_payload
-to gather the whole contents of a message, eg:
-
-    case LWS_CALLBACK_RECEIVE:
-    {
-        Client * const client = (Client *)user;
-        const size_t remaining = libwebsockets_remaining_packet_payload(wsi);
-
-        if (!remaining && libwebsocket_is_final_fragment(wsi)) {
-            if (client->HasFragments()) {
-                client->AppendMessageFragment(in, len, 0);
-                in = (void *)client->GetMessage();
-                len = client->GetMessageLength();
-            }
-
-            client->ProcessMessage((char *)in, len, wsi);
-            client->ResetMessage();
-        } else
-            client->AppendMessageFragment(in, len, remaining);
-    }
-    break;
-
-The test app llibwebsockets-test-fraggle sources also show how to
-deal with fragmented messages.
-
-
-Debug Logging
--------------
-
-Also using lws_set_log_level api you may provide a custom callback to actually
-emit the log string.  By default, this points to an internal emit function
-that sends to stderr.  Setting it to NULL leaves it as it is instead.
-
-A helper function lwsl_emit_syslog() is exported from the library to simplify
-logging to syslog.  You still need to use setlogmask, openlog and closelog
-in your user code.
-
-The logging apis are made available for user code.
-
-lwsl_err(...)
-lwsl_warn(...)
-lwsl_notice(...)
-lwsl_info(...)
-lwsl_debug(...)
-
-The difference between notice and info is that notice will be logged by default
-whereas info is ignored by default.
-
-
-External Polling Loop support
------------------------------
-
-libwebsockets maintains an internal poll() array for all of its
-sockets, but you can instead integrate the sockets into an
-external polling array.  That's needed if libwebsockets will
-cooperate with an existing poll array maintained by another
-server.
-
-Four callbacks LWS_CALLBACK_ADD_POLL_FD, LWS_CALLBACK_DEL_POLL_FD,
-LWS_CALLBACK_SET_MODE_POLL_FD and LWS_CALLBACK_CLEAR_MODE_POLL_FD
-appear in the callback for protocol 0 and allow interface code to
-manage socket descriptors in other poll loops.
-
-You can pass all pollfds that need service to libwebsocket_service_fd(), even
-if the socket or file does not belong to libwebsockets it is safe.
-
-If libwebsocket handled it, it zeros the pollfd revents field before returning.
-So you can let libwebsockets try and if pollfd->revents is nonzero on return,
-you know it needs handling by your code.
-
-
-Using with in c++ apps
-----------------------
-
-The library is ready for use by C++ apps.  You can get started quickly by
-copying the test server
-
-$ cp test-server/test-server.c test.cpp
-
-and building it in C++ like this
-
-$ g++ -DINSTALL_DATADIR=\"/usr/share\" -ocpptest test.cpp -lwebsockets
-
-INSTALL_DATADIR is only needed because the test server uses it as shipped, if
-you remove the references to it in your app you don't need to define it on
-the g++ line either.
-
-
-Availability of header information
-----------------------------------
-
-From v1.2 of the library onwards, the HTTP header content is free()d as soon
-as the websocket connection is established.  For websocket servers, you can
-copy interesting headers by handling LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION
-callback, for clients there's a new callback just for this purpose
-LWS_CALLBACK_CLIENT_FILTER_PRE_ESTABLISH.
-
-
-TCP Keepalive
--------------
-
-It is possible for a connection which is not being used to send to die
-silently somewhere between the peer and the side not sending.  In this case
-by default TCP will just not report anything and you will never get any more
-incoming data or sign the link is dead until you try to send.
-
-To deal with getting a notification of that situation, you can choose to
-enable TCP keepalives on all libwebsockets sockets, when you create the
-context.
-
-To enable keepalive, set the ka_time member of the context creation parameter
-struct to a nonzero value (in seconds) at context creation time.  You should
-also fill ka_probes and ka_interval in that case.
-
-With keepalive enabled, the TCP layer will send control packets that should
-stimulate a response from the peer without affecting link traffic.  If the
-response is not coming, the socket will announce an error at poll() forcing
-a close.
-
-Note that BSDs don't support keepalive time / probes / inteveral per-socket
-like Linux does.  On those systems you can enable keepalive by a nonzero
-value in ka_time, but the systemwide kernel settings for the time / probes/
-interval are used, regardless of what nonzero value is in ka_time.
-
-Optimizing SSL connections
---------------------------
-
-There's a member ssl_cipher_list in the lws_context_creation_info struct
-which allows the user code to restrict the possible cipher selection at
-context-creation time.
-
-You might want to look into that to stop the ssl peers selecting a ciher which
-is too computationally expensive.  To use it, point it to a string like
-
-"RC4-MD5:RC4-SHA:AES128-SHA:AES256-SHA:HIGH:!DSS:!aNULL"
-
-if left NULL, then the "DEFAULT" set of ciphers are all possible to select.
-
-
-Async nature of client connections
-----------------------------------
-
-When you call libwebsocket_client_connect(..) and get a wsi back, it does not
-mean your connection is active.  It just mean it started trying to connect.
-
-Your client connection is actually active only when you receive
-LWS_CALLBACK_CLIENT_ESTABLISHED for it.
-
-There's a 5 second timeout for the connection, and it may give up or die for
-other reasons, if any of that happens you'll get a
-LWS_CALLBACK_CLIENT_CONNECTION_ERROR callback on protocol 0 instead for the
-wsi.
-
-After attempting the connection and getting back a non-NULL wsi you should
-loop calling libwebsocket_service() until one of the above callbacks occurs.
-
-As usual, see test-client.c for example code.
-

dependencies/libwebsockets/README.test-apps

@@ -1,272 +0,0 @@
-Testing server with a browser
------------------------------
-
-If you run libwebsockets-test-server and point your browser
-(eg, Chrome) to
-
-  http://127.0.0.1:7681
-
-It will fetch a script in the form of test.html, and then run the
-script in there on the browser to open a websocket connection.
-Incrementing numbers should appear in the browser display.
-
-By default the test server logs to both stderr and syslog, you can control
-what is logged using -d <log level>, see later.
-
-
-Running test server as a Daemon
--------------------------------
-
-You can use the -D option on the test server to have it fork into the
-background and return immediately.  In this daemonized mode all stderr is
-disabled and logging goes only to syslog, eg, /var/log/messages or similar.
-
-The server maintains a lockfile at /tmp/.lwsts-lock that contains the pid
-of the master process, and deletes this file when the master process
-terminates.
-
-To stop the daemon, do
-
-  kill `cat /tmp/.lwsts-lock`
-
-If it finds a stale lock (the pid mentioned in the file does not exist
-any more) it will delete the lock and create a new one during startup.
-
-If the lock is valid, the daemon will exit with a note on stderr that
-it was already running.s
-
-
-Using SSL on the server side
-----------------------------
-
-To test it using SSL/WSS, just run the test server with
-
-$ libwebsockets-test-server --ssl
-
-and use the URL
-
-  https://127.0.0.1:7681
-
-The connection will be entirely encrypted using some generated
-certificates that your browser will not accept, since they are
-not signed by any real Certificate Authority.  Just accept the
-certificates in the browser and the connection will proceed
-in first https and then websocket wss, acting exactly the
-same.
-
-test-server.c is all that is needed to use libwebsockets for
-serving both the script html over http and websockets.
-
-
-Testing websocket client support
---------------------------------
-
-If you run the test server as described above, you can also
-connect to it using the test client as well as a browser.
-
-$ libwebsockets-test-client localhost
-
-will by default connect to the test server on localhost:7681
-and print the dumb increment number from the server at the
-same time as drawing random circles in the mirror protocol;
-if you connect to the test server using a browser at the
-same time you will be able to see the circles being drawn.
-
-
-Testing simple echo
--------------------
-
-You can test against echo.websockets.org as a sanity test like
-this (the client connects to port 80 by default):
-
-$ libwebsockets-test-echo --client echo.websocket.org
-
-This echo test is of limited use though because it doesn't
-negotiate any protocol.  You can run the same test app as a
-local server, by default on localhost:7681
-
-$ libwebsockets-test-echo
-
-and do the echo test against the local echo server
-
-$ libwebsockets-test-echo --client localhost --port 7681
-
-If you add the --ssl switch to both the client and server, you can also test
-with an encrypted link.
-
-
-Testing SSL on the client side
-------------------------------
-
-To test SSL/WSS client action, just run the client test with
-
-$ libwebsockets-test-client localhost --ssl
-
-By default the client test applet is set to accept selfsigned
-certificates used by the test server, this is indicated by the
-use_ssl var being set to 2.  Set it to 1 to reject any server
-certificate that it doesn't have a trusted CA cert for.
-
-
-Using the websocket ping utility
---------------------------------
-
-libwebsockets-test-ping connects as a client to a remote
-websocket server using 04 protocol and pings it like the
-normal unix ping utility.
-
-$ libwebsockets-test-ping localhost                
-handshake OK for protocol lws-mirror-protocol
-Websocket PING localhost.localdomain (127.0.0.1) 64 bytes of data.
-64 bytes from localhost: req=1 time=0.1ms
-64 bytes from localhost: req=2 time=0.1ms
-64 bytes from localhost: req=3 time=0.1ms
-64 bytes from localhost: req=4 time=0.2ms
-64 bytes from localhost: req=5 time=0.1ms
-64 bytes from localhost: req=6 time=0.2ms
-64 bytes from localhost: req=7 time=0.2ms
-64 bytes from localhost: req=8 time=0.1ms
-^C
---- localhost.localdomain websocket ping statistics ---
-8 packets transmitted, 8 received, 0% packet loss, time 7458ms
-rtt min/avg/max = 0.110/0.185/0.218 ms
-$
-
-By default it sends 64 byte payload packets using the 04
-PING packet opcode type.  You can change the payload size
-using the -s= flag, up to a maximum of 125 mandated by the
-04 standard.
-
-Using the lws-mirror protocol that is provided by the test
-server, libwebsockets-test-ping can also use larger payload
-sizes up to 4096 is BINARY packets; lws-mirror will copy
-them back to the client and they appear as a PONG.  Use the
--m flag to select this operation.
-
-The default interval between pings is 1s, you can use the -i=
-flag to set this, including fractions like -i=0.01 for 10ms
-interval.
-
-Before you can even use the PING opcode that is part of the
-standard, you must complete a handshake with a specified
-protocol.  By default lws-mirror-protocol is used which is
-supported by the test server.  But if you are using it on
-another server, you can specify the protcol to handshake with
-by --protocol=protocolname
-
-
-Fraggle test app
-----------------
-
-By default it runs in server mode
-
-$ libwebsockets-test-fraggle
-libwebsockets test fraggle
-(C) Copyright 2010-2011 Andy Green <andy@warmcat.com> licensed under LGPL2.1
- Compiled with SSL support, not using it
- Listening on port 7681
-server sees client connect
-accepted v06 connection
-Spamming 360 random fragments
-Spamming session over, len = 371913. sum = 0x2D3C0AE
-Spamming 895 random fragments
-Spamming session over, len = 875970. sum = 0x6A74DA1
-...
-
-You need to run a second session in client mode, you have to
-give the -c switch and the server address at least:
-
-$ libwebsockets-test-fraggle -c localhost 
-libwebsockets test fraggle
-(C) Copyright 2010-2011 Andy Green <andy@warmcat.com> licensed under LGPL2.1
- Client mode
-Connecting to localhost:7681
-denied deflate-stream extension
-handshake OK for protocol fraggle-protocol
-client connects to server
-EOM received 371913 correctly from 360 fragments
-EOM received 875970 correctly from 895 fragments
-EOM received 247140 correctly from 258 fragments
-EOM received 695451 correctly from 692 fragments
-...
-
-The fraggle test sends a random number up to 1024 fragmented websocket frames
-each of a random size between 1 and 2001 bytes in a single message, then sends
-a checksum and starts sending a new randomly sized and fragmented message.
-
-The fraggle test client receives the same message fragments and computes the
-same checksum using websocket framing to see when the message has ended.  It
-then accepts the server checksum message and compares that to its checksum.
-
-
-proxy support
--------------
-
-The http_proxy environment variable is respected by the client
-connection code for both ws:// and wss://.  It doesn't support
-authentication.
-
-You use it like this
-
-export http_proxy=myproxy.com:3128
-libwebsockets-test-client someserver.com
-
-
-debug logging
--------------
-
-By default logging of severity "notice", "warn" or "err" is enabled to stderr.
-
-Again by default other logging is comiled in but disabled from printing.
-
-If you want to eliminate the debug logging below notice  in severity, use the
---disable-debug configure option to have it removed from the code by the
-preprocesser.
-
-If you want to see more detailed debug logs, you can control a bitfield to
-select which logs types may print using the lws_set_log_level() api, in the
-test apps you can use -d <number> to control this.  The types of logging
-available are (OR together the numbers to select multiple)
-
- 1   ERR
- 2   WARN
- 4   NOTICE
- 8   INFO
- 16  DEBUG
- 32  PARSER
- 64  HEADER
- 128 EXTENSION
- 256 CLIENT
- 512 LATENCY
-
-
-Websocket version supported
----------------------------
-
-The final IETF standard is supported for both client and server, protocol
-version 13.
-
-
-Latency Tracking
-----------------
-
-Since libwebsockets runs using poll() and a single threaded approach, any
-unexpected latency coming from system calls would be bad news.  There's now
-a latency tracking scheme that can be built in with --with-latency at
-configure-time, logging the time taken for system calls to complete and if
-the whole action did complete that time or was deferred.
-
-You can see the detailed data by enabling logging level 512 (eg, -d 519 on
-the test server to see that and the usual logs), however even without that
-the "worst" latency is kept and reported to the logs with NOTICE severity
-when the context is destroyed.
-
-Some care is needed interpreting them, if the action completed the first figure
-(in us) is the time taken for the whole action, which may have retried through
-the poll loop many times and will depend on network roundtrip times.  High
-figures here don't indicate a problem.  The figure in us reported after "lat"
-in the logging is the time taken by this particular attempt.  High figures
-here may indicate a problem, or if you system is loaded with another app at
-that time, such as the browser, it may simply indicate the OS gave preferential
-treatment to the other app during that call.
-

dependencies/libwebsockets/changelog

@@ -1,621 +0,0 @@
-Changelog
----------
-
-v1.3-chrome37-firefox30
-=======================
-
- .gitignore                                               |    1 -
- CMakeLists.txt                                           |  447 +++--
- README.build                                             |   35 +-
- README.coding                                            |   14 +
- changelog                                                |   66 +
- cmake/LibwebsocketsConfig.cmake.in                       |   17 +
- cmake/LibwebsocketsConfigVersion.cmake.in                |   11 +
- config.h.cmake                                           |   18 +
- cross-ming.cmake                                         |   31 +
- cross-openwrt-makefile                                   |   91 +
- lib/client-handshake.c                                   |  205 ++-
- lib/client-parser.c                                      |   58 +-
- lib/client.c                                             |  158 +-
- lib/context.c                                            |  341 ++++
- lib/extension-deflate-frame.c                            |    2 +-
- lib/extension.c                                          |  178 ++
- lib/handshake.c                                          |  287 +---
- lib/lextable.h                                           |  338 ++++
- lib/libev.c                                              |  175 ++
- lib/libwebsockets.c                                      | 2089 +++--------------------
- lib/libwebsockets.h                                      |  253 ++-
- lib/lws-plat-unix.c                                      |  404 +++++
- lib/lws-plat-win.c                                       |  358 ++++
- lib/minilex.c                                            |  530 +++---
- lib/output.c                                             |  445 ++---
- lib/parsers.c                                            |  682 ++++----
- lib/pollfd.c                                             |  239 +++
- lib/private-libwebsockets.h                              |  501 +++++-
- lib/server-handshake.c                                   |  274 +--
- lib/server.c                                             |  858 ++++++++--
- lib/service.c                                            |  517 ++++++
- lib/sha-1.c                                              |   38 +-
- lib/ssl-http2.c                                          |   78 +
- lib/ssl.c                                                |  571 +++++++
- test-server/attack.sh                                    |  101 +-
- test-server/test-client.c                                |    9 +-
- test-server/test-echo.c                                  |   17 +-
- test-server/test-fraggle.c                               |    7 -
- test-server/test-ping.c                                  |   12 +-
- test-server/test-server.c                                |  330 ++--
- test-server/test.html                                    |    4 +-
- win32port/client/client.vcxproj                          |  259 ---
- win32port/client/client.vcxproj.filters                  |   39 -
- .../libwebsocketswin32.vcxproj.filters                   |   93 -
- win32port/server/server.vcxproj                          |  276 ---
- win32port/server/server.vcxproj.filters                  |   51 -
- win32port/win32helpers/gettimeofday.h                    |   59 +-
- win32port/win32helpers/netdb.h                           |    1 -
- win32port/win32helpers/strings.h                         |    0
- win32port/win32helpers/sys/time.h                        |    1 -
- win32port/win32helpers/unistd.h                          |    0
- win32port/win32helpers/websock-w32.c                     |  104 --
- win32port/win32helpers/websock-w32.h                     |   62 -
- win32port/win32port.sln                                  |  100 --
- win32port/zlib/gzio.c                                    |    3 +-
- 55 files changed, 6779 insertions(+), 5059 deletions(-)
-
-
-User api additions
-------------------
-
-POST method is supported
-
-The protocol 0 / HTTP callback can now get two new kinds of callback,
-LWS_CALLBACK_HTTP_BODY (in and len are a chunk of the body of the HTTP request)
-and LWS_CALLBACK_HTTP_BODY_COMPLETION (the expected amount of body has arrived
-and been passed to the user code already).  These callbacks are used with the
-post method (see the test server for details).
-
-The period between the HTTP header completion and the completion of the body
-processing is protected by a 5s timeout.
-
-The chunks are stored in a malloc'd buffer of size protocols[0].rx_buffer_size.
-
-
-New server option you can enable from user code
-LWS_SERVER_OPTION_ALLOW_NON_SSL_ON_SSL_PORT allows non-SSL connections to
-also be accepted on an SSL listening port.  It's disabled unless you enable
-it explicitly.
-
-
-Two new callbacks are added in protocols[0] that are optional for allowing
-limited thread access to libwebsockets, LWS_CALLBACK_LOCK_POLL and
-LWS_CALLBACK_UNLOCK_POLL.
-
-If you use them, they protect internal and external poll list changes, but if
-you want to use external thread access to libwebsocket_callback_on_writable()
-you have to implement your locking here even if you don't use external
-poll support.
-
-If you will use another thread for this, take a lot of care about managing
-your list of live wsi by doing it from ESTABLISHED and CLOSED callbacks
-(with your own locking).
-
-If you configure cmake with -DLWS_WITH_LIBEV=1 then the code allowing the libev
-eventloop instead of the default poll() one will also be compiled in.  But to
-use it, you must also set the LWS_SERVER_OPTION_LIBEV flag on the context
-creation info struct options member.
-
-IPV6 is supported and enabled by default except for Windows, you can disable
-the support at build-time by giving -DLWS_IPV6=, and disable use of it even if
-compiled in by making sure the flag LWS_SERVER_OPTION_DISABLE_IPV6 is set on
-the context creation info struct options member.
-
-You can give LWS_SERVER_OPTION_DISABLE_OS_CA_CERTS option flag to
-guarantee the OS CAs will not be used, even if that support was selected at
-build-time.
-
-Optional "token limits" may be enforced by setting the member "token_limits"
-in struct lws_context_creation_info to point to a struct lws_token_limits.
-NULL means no token limits used for compatibility.
-
-
-User api changes
-----------------
-
-Extra optional argument to libwebsockets_serve_http_file() allows injecion
-of HTTP headers into the canned response.  Eg, cookies may be added like
-that without getting involved in having to send the header by hand.
-
-A new info member http_proxy_address may be used at context creation time to
-set the http proxy.  If non-NULL, it overrides http_proxy environment var.
-
-Cmake supports LWS_SSL_CLIENT_USE_OS_CA_CERTS defaulting to on, which gets
-the client to use the OS CA Roots.  If you're worried somebody with the
-ability to forge for force creation of a client cert from the root CA in
-your OS, you should disable this since your selfsigned $0 cert is a lot safer
-then...
-
-
-v1.23-chrome32-firefox24
-========================
-
- Android.mk                            |   29 +
- CMakeLists.txt                        |  573 ++++++++----
- COPYING                               |  503 -----------
- INSTALL                               |  365 --------
- Makefile.am                           |   13 -
- README.build                          |  371 ++------
- README.coding                         |   63 ++
- autogen.sh                            | 1578 ---------------------------------
- changelog                             |   69 ++
- cmake/FindGit.cmake                   |  163 ++++
- cmake/FindOpenSSLbins.cmake           |   15 +-
- cmake/UseRPMTools.cmake               |  176 ++++
- config.h.cmake                        |   25 +-
- configure.ac                          |  226 -----
- cross-arm-linux-gnueabihf.cmake       |   28 +
- lib/Makefile.am                       |   89 --
- lib/base64-decode.c                   |   98 +-
- lib/client-handshake.c                |  123 ++-
- lib/client-parser.c                   |   19 +-
- lib/client.c                          |  145 ++-
- lib/daemonize.c                       |    4 +-
- lib/extension.c                       |    2 +-
- lib/getifaddrs.h                      |    4 +-
- lib/handshake.c                       |   76 +-
- lib/libwebsockets.c                   |  491 ++++++----
- lib/libwebsockets.h                   |  164 ++--
- lib/output.c                          |  214 ++++-
- lib/parsers.c                         |  102 +--
- lib/private-libwebsockets.h           |   66 +-
- lib/server-handshake.c                |    5 +-
- lib/server.c                          |   29 +-
- lib/sha-1.c                           |    2 +-
- libwebsockets-api-doc.html            |  249 +++---
- libwebsockets.pc.in                   |   11 -
- libwebsockets.spec                    |   14 +-
- m4/ignore-me                          |    2 -
- scripts/FindLibWebSockets.cmake       |   33 +
- scripts/kernel-doc                    |    1 +
- test-server/Makefile.am               |  131 ---
- test-server/leaf.jpg                  |  Bin 0 -> 2477518 bytes
- test-server/test-client.c             |   78 +-
- test-server/test-echo.c               |   33 +-
- test-server/test-fraggle.c            |   26 +-
- test-server/test-ping.c               |   15 +-
- test-server/test-server.c             |  197 +++-
- test-server/test.html                 |    5 +-
- win32port/win32helpers/gettimeofday.c |   74 +-
- win32port/win32helpers/websock-w32.h  |    6 +-
- 48 files changed, 2493 insertions(+), 4212 deletions(-)
-
-
-User api additions
-------------------
-
- - You can now call libwebsocket_callback_on_writable() on http connectons,
- 	and get a LWS_CALLBACK_HTTP_WRITEABLE callback, the same way you can
-	regulate writes with a websocket protocol connection.
-
- - A new member in the context creation parameter struct "ssl_cipher_list" is
- 	added, replacing CIPHERS_LIST_STRING.  NULL means use the ssl library
-	default list of ciphers.
-
- - Not really an api addition, but libwebsocket_service_fd() will now zero
- 	the revents field of the pollfd it was called with if it handled the
-	descriptor.  So you can tell if it is a non-lws fd by checking revents
-	after the service call... if it's still nonzero, the descriptor
-	belongs to you and you need to take care of it.
-
- - libwebsocket_rx_flow_allow_all_protocol(protocol) will unthrottle all
- 	connections with the established protocol.  It's designed to be
-	called from user server code when it sees it can accept more input
-	and may have throttled connections using the server rx flow apis
-	while it was unable to accept any other input  The user server code
-	then does not have to try to track while connections it choked, this
-	will free up all of them in one call.
-
- - there's a new, optional callback LWS_CALLBACK_CLOSED_HTTP which gets
-	called when an HTTP protocol socket closes
-
- - for LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION callback, the user_space alloc
-	has already been done before the callback happens.  That means we can
-	use the user parameter to the callback to contain the user pointer, and
-	move the protocol name to the "in" parameter.  The docs for this
-	callback are also updated to reflect how to check headers in there.
-
- - libwebsocket_client_connect() is now properly nonblocking and async.  See
-	README.coding and test-client.c for information on the callbacks you
-	can rely on controlling the async connection period with.
-
- - if your OS does not support the http_proxy environment variable convention
- 	(eg, reportedly OSX), you can use a new api libwebsocket_set_proxy()
- 	to set the proxy details inbetween context creation and the connection
- 	action.  For OSes that support http_proxy, that's used automatically.
-
-User api changes
-----------------
-
- - the external poll callbacks now get the socket descriptor coming from the
- 	"in" parameter.  The user parameter provides the user_space for the
-	wsi as it normally does on the other callbacks.
-	LWS_CALLBACK_FILTER_NETWORK_CONNECTION also has the socket descriptor
-	delivered by @in now instead of @user.
-
- - libwebsocket_write() now returns -1 for error, or the amount of data
- 	actually accepted for send.  Under load, the OS may signal it is
-	ready to send new data on the socket, but have only a restricted
-	amount of memory to buffer the packet compared to usual.
-
-
-User api removal
-----------------
-
- - libwebsocket_ensure_user_space() is removed from the public api, if you
- 	were using it to get user_space, you need to adapt your code to only
-	use user_space inside the user callback.
-
- - CIPHERS_LIST_STRING is removed
-
- - autotools build has been removed.  See README.build for info on how to
- 	use CMake for your platform
-
-
-v1.21-chrome26-firefox18
-========================
-
- - Fixes buffer overflow bug in max frame size handling if you used the
- 	default protocol buffer size.  If you declared rx_buffer_size in your
-	protocol, which is recommended anyway, your code was unaffected.
-
-v1.2-chrome26-firefox18
-=======================
-
-Diffstat
---------
-
- .gitignore                                                      |  16 +++
- CMakeLists.txt                                                  | 544 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- LICENSE                                                         | 526 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- Makefile.am                                                     |   1 +
- README                                                          |  20 +++
- README.build                                                    | 258 ++++++++++++++++++++++++++++++++-----
- README.coding                                                   |  52 ++++++++
- changelog                                                       | 136 ++++++++++++++++++++
- cmake/FindOpenSSLbins.cmake                                     |  33 +++++
- config.h.cmake                                                  | 173 +++++++++++++++++++++++++
- configure.ac                                                    |  22 +++-
- lib/Makefile.am                                                 |  20 ++-
- lib/base64-decode.c                                             |   2 +-
- lib/client-handshake.c                                          | 190 +++++++++++-----------------
- lib/client-parser.c                                             |  88 +++++++------
- lib/client.c                                                    | 384 ++++++++++++++++++++++++++++++-------------------------
- lib/daemonize.c                                                 |  32 +++--
- lib/extension-deflate-frame.c                                   |  58 +++++----
- lib/extension-deflate-stream.c                                  |  19 ++-
- lib/extension-deflate-stream.h                                  |   4 +-
- lib/extension.c                                                 |  11 +-
- lib/getifaddrs.c                                                | 315 +++++++++++++++++++++++-----------------------
- lib/getifaddrs.h                                                |  30 ++---
- lib/handshake.c                                                 | 124 +++++++++++-------
- lib/libwebsockets.c                                             | 736 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------
- lib/libwebsockets.h                                             | 237 ++++++++++++++++++++++------------
- lib/output.c                                                    | 192 +++++++++++-----------------
- lib/parsers.c                                                   | 966 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------
- lib/private-libwebsockets.h                                     | 225 +++++++++++++++++++++------------
- lib/server-handshake.c                                          |  82 ++++++------
- lib/server.c                                                    |  96 +++++++-------
- libwebsockets-api-doc.html                                      | 189 ++++++++++++++++++----------
- libwebsockets.spec                                              |  17 +--
- test-server/attack.sh                                           | 148 ++++++++++++++++++++++
- test-server/test-client.c                                       | 125 +++++++++---------
- test-server/test-echo.c                                         |  31 +++--
- test-server/test-fraggle.c                                      |  32 ++---
- test-server/test-ping.c                                         |  52 ++++----
- test-server/test-server.c                                       | 129 ++++++++++++-------
- win32port/libwebsocketswin32/libwebsocketswin32.vcxproj         | 279 ----------------------------------------
- win32port/libwebsocketswin32/libwebsocketswin32.vcxproj.filters |  23 +++-
- 41 files changed, 4398 insertions(+), 2219 deletions(-)
-
-
-User api additions
-------------------
-
- - lws_get_library_version() returns a const char * with a string like
- 	 "1.1 9e7f737", representing the library version from configure.ac
-	 and the git HEAD hash the library was built from
-
- - TCP Keepalive can now optionally be applied to all lws sockets, on Linux
- 	also with controllable timeout, number of probes and probe interval.
-	(On BSD type OS, you can only use system default settings for the
-	timing and retries, although enabling it is supported by setting
-	ka_time to nonzero, the exact value has no meaning.)
-	This enables detection of idle connections which are logically okay,
-	but are in fact dead, due to network connectivity issues at the server,
-	client, or any intermediary.  By default it's not enabled, but you
-	can enable it by setting a non-zero timeout (in seconds) at the new
-	ka_time member at context creation time.
-
- - Two new optional user callbacks added, LWS_CALLBACK_PROTOCOL_DESTROY which
- 	is called one-time per protocol as the context is being destroyed, and
-	LWS_CALLBACK_PROTOCOL_INIT which is called when the context is created
-	and the protocols are added, again it's a one-time affair.
-	This lets you manage per-protocol allocations properly including
-	cleaning up after yourself when the server goes down.
-
-User api changes
-----------------
-
- - libwebsocket_create_context() has changed from taking a ton of parameters
-	to just taking a pointer to a struct containing the parameters.  The
-	struct lws_context_creation_info is in libwebsockets.h, the members
-	are in the same order as when they were parameters to the call
-	previously.  The test apps are all updated accordingly so you can
-	see example code there.
-
- - Header tokens are now deleted after the websocket connection is
-	established.  Not just the header data is saved, but the pointer and
-	length array is also removed from (union) scope saving several hundred
-	bytes per connection once it is established
-
- - struct libwebsocket_protocols has a new member rx_buffer_size, this
-	controls rx buffer size per connection of that protocol now.  Sources
-	for apps built against older versions of the library won't declare
-	this in their protocols, defaulting it to 0.  Zero buffer is legal,
-	it causes a default buffer to be allocated (currently 4096)
-
-	If you want to receive only atomic frames in your user callback, you
-	should set this to greater than your largest frame size.  If a frame
-	comes that exceeds that, no error occurs but the callback happens as
-	soon as the buffer limit is reached, and again if it is reached again
-	or the frame completes.  You can detect that has happened by seeing
-	there is still frame content pending using
-	libwebsockets_remaining_packet_payload()
-
-	By correctly setting this, you can save a lot of memory when your
-	protocol has small frames (see the test server and client sources).
-
- - LWS_MAX_HEADER_LEN now defaults to 1024 and is the total amount of known
- 	header payload lws can cope with, that includes the GET URL, origin
-	etc.  Headers not understood by lws are ignored and their payload
-	not included in this.
-
-
-User api removals
------------------
-
- - The configuration-time option MAX_USER_RX_BUFFER has been replaced by a
-	buffer size chosen per-protocol.  For compatibility, there's a default
-	of 4096 rx buffer, but user code should set the appropriate size for
-	the protocol frames.
-
- - LWS_INITIAL_HDR_ALLOC and LWS_ADDITIONAL_HDR_ALLOC are no longer needed
- 	and have been removed.  There's a new header management scheme that
-	handles them in a much more compact way.
-
- - libwebsockets_hangup_on_client() is removed.  If you want to close the
- 	connection you must do so from the user callback and by returning
-	-1 from there.
-
- - libwebsocket_close_and_free_session() is now private to the library code
- 	only and not exposed for user code.  If you want to close the
-	connection, you must do so from the user callback by returning -1
-	from there.
-
-
-New features
-------------
-
- - Cmake project file added, aimed initially at Windows support: this replaces
-	the visual studio project files that were in the tree until now.
-
- - CyaSSL now supported in place of OpenSSL (--use-cyassl on configure)
-
- - PATH_MAX or MAX_PATH no longer needed
-
- - cutomizable frame rx buffer size by protocol
-
- - optional TCP keepalive so dead peers can be detected, can be enabled at
- 	context-creation time
-
- - valgrind-clean: no SSL or CyaSSL: completely clean.  With OpenSSL, 88 bytes
- 	lost at OpenSSL library init and symptomless reports of uninitialized
-	memory usage... seems to be a known and ignored problem at OpenSSL
-
- - By default debug is enabled and the library is built for -O0 -g to faclitate
-	that.  Use --disable-debug configure option to build instead with -O4
-	and no -g (debug info), obviously providing best performance and
-	reduced binary size.
-
- - 1.0 introduced some code to try to not deflate small frames, however this
- 	seems to break when confronted with a mixture of frames above and
-	below the threshold, so it's removed.  Veto the compression extension
-	in your user callback if you will typically have very small frames.
-
- - There are many memory usage improvements, both a reduction in malloc/
- 	realloc and architectural changes.  A websocket connection now
-	consumes only 296 bytes with SSL or 272 bytes without on x86_64,
-	during header processing an additional 1262 bytes is allocated in a
-	single malloc, but is freed when the websocket connection starts.
-	The RX frame buffer defined by the protocol in user
-	code is also allocated per connection, this represents the largest
-	frame you can receive atomically in that protocol.
-
- - On ARM9 build, just http+ws server no extensions or ssl, <12Kbytes .text
- 	and 112 bytes per connection (+1328 only during header processing)
-
-
-v1.1-chrome26-firefox18
-=======================
-
-Diffstat
---------
-
- Makefile.am                            |    4 +
- README-test-server                     |  291 ---
- README.build                           |  239 ++
- README.coding                          |  138 ++
- README.rst                             |   72 -
- README.test-apps                       |  272 +++
- configure.ac                           |  116 +-
- lib/Makefile.am                        |   55 +-
- lib/base64-decode.c                    |    5 +-
- lib/client-handshake.c                 |  121 +-
- lib/client-parser.c                    |  394 ++++
- lib/client.c                           |  807 +++++++
- lib/daemonize.c                        |  212 ++
- lib/extension-deflate-frame.c          |  132 +-
- lib/extension-deflate-stream.c         |   12 +-
- lib/extension-x-google-mux.c           | 1223 ----------
- lib/extension-x-google-mux.h           |   96 -
- lib/extension.c                        |    8 -
- lib/getifaddrs.c                       |  271 +++
- lib/getifaddrs.h                       |   76 +
- lib/handshake.c                        |  582 +----
- lib/libwebsockets.c                    | 2493 ++++++---------------
- lib/libwebsockets.h                    |  115 +-
- lib/md5.c                              |  217 --
- lib/minilex.c                          |  440 ++++
- lib/output.c                           |  628 ++++++
- lib/parsers.c                          | 2016 +++++------------
- lib/private-libwebsockets.h            |  284 +--
- lib/server-handshake.c                 |  275 +++
- lib/server.c                           |  377 ++++
- libwebsockets-api-doc.html             |  300 +--
- m4/ignore-me                           |    2 +
- test-server/Makefile.am                |  111 +-
- test-server/libwebsockets.org-logo.png |  Bin 0 -> 7029 bytes
- test-server/test-client.c              |   45 +-
- test-server/test-echo.c                |  330 +++
- test-server/test-fraggle.c             |   20 +-
- test-server/test-ping.c                |   22 +-
- test-server/test-server-extpoll.c      |  554 -----
- test-server/test-server.c              |  349 ++-
- test-server/test.html                  |    3 +-
- win32port/zlib/ZLib.vcxproj            |  749 ++++---
- win32port/zlib/ZLib.vcxproj.filters    |  188 +-
- win32port/zlib/adler32.c               |  348 ++-
- win32port/zlib/compress.c              |  160 +-
- win32port/zlib/crc32.c                 |  867 ++++----
- win32port/zlib/crc32.h                 |  882 ++++----
- win32port/zlib/deflate.c               | 3799 +++++++++++++++-----------------
- win32port/zlib/deflate.h               |  688 +++---
- win32port/zlib/gzclose.c               |   50 +-
- win32port/zlib/gzguts.h                |  325 ++-
- win32port/zlib/gzlib.c                 | 1157 +++++-----
- win32port/zlib/gzread.c                | 1242 ++++++-----
- win32port/zlib/gzwrite.c               | 1096 +++++----
- win32port/zlib/infback.c               | 1272 ++++++-----
- win32port/zlib/inffast.c               |  680 +++---
- win32port/zlib/inffast.h               |   22 +-
- win32port/zlib/inffixed.h              |  188 +-
- win32port/zlib/inflate.c               | 2976 +++++++++++++------------
- win32port/zlib/inflate.h               |  244 +-
- win32port/zlib/inftrees.c              |  636 +++---
- win32port/zlib/inftrees.h              |  124 +-
- win32port/zlib/trees.c                 | 2468 +++++++++++----------
- win32port/zlib/trees.h                 |  256 +--
- win32port/zlib/uncompr.c               |  118 +-
- win32port/zlib/zconf.h                 |  934 ++++----
- win32port/zlib/zlib.h                  | 3357 ++++++++++++++--------------
- win32port/zlib/zutil.c                 |  642 +++---
- win32port/zlib/zutil.h                 |  526 ++---
- 69 files changed, 19556 insertions(+), 20145 deletions(-)
-
-user api changes
-----------------
-
- - libwebsockets_serve_http_file() now takes a context as first argument
-
- - libwebsockets_get_peer_addresses() now takes a context and wsi as first
-	two arguments
-
-
-user api additions
-------------------
-
- - lwsl_...() logging apis, default to stderr but retargetable by user code;
-	may be used also by user code
-
- - lws_set_log_level() set which logging apis are able to emit (defaults to
-	notice, warn, err severities), optionally set the emit callback
-
- - lwsl_emit_syslog() helper callback emits to syslog
-
- - lws_daemonize() helper code that forks the app into a headless daemon
-	properly, maintains a lock file with pid in suitable for sysvinit etc to
-	control lifecycle
-
- - LWS_CALLBACK_HTTP_FILE_COMPLETION callback added since http file
-	transfer is now asynchronous (see test server code)
-
- - lws_frame_is_binary() from a wsi pointer, let you know if the received
-	data was sent in BINARY mode
-
-
-user api removals
------------------
-
- - libwebsockets_fork_service_loop() - no longer supported (had intractable problems)
-	arrange your code to act from the user callback instead from same
-	process context as the service loop
-
- - libwebsockets_broadcast() - use libwebsocket_callback_on_writable[_all_protocol]()
-	instead from same process context as the service loop.  See the test apps
-	for examples.
-
- - x-google-mux() removed until someone wants it
-
- - pre -v13 (ancient) protocol support removed
-
-
-New features
-------------
-
- - echo test server and client compatible with echo.websocket.org added
-
- - many new configure options (see README.build) to reduce footprint of the
-	library to what you actually need, eg, --without-client and
-	--without-server
-
- - http + websocket server can build to as little as 12K .text for ARM
-
- - no more MAX_CLIENTS limitation; adapts to support the max number of fds
-	allowed to the process by ulimit, defaults to 1024 on Fedora and
-	Ubuntu.  Use ulimit to control this without needing to configure
-	the library.  Code here is smaller and faster.
-
- - adaptive ratio of listen socket to connection socket service allows
-	good behaviour under Apache ab test load.  Tested with thousands
-	of simultaneous connections
-
- - reduction in per-connection memory footprint by moving to a union to hold
-	mutually-exclusive state for the connection
-
- - robustness: Out of Memory taken care of for all allocation code now
-
- - internal getifaddrs option if your toolchain lacks it (some uclibc)
-
- - configurable memory limit for deflate operations
-
- - improvements in SSL code nonblocking operation, possible hang solved,
-	some SSL operations broken down into pollable states so there is
-	no library blocking, timeout coverage for SSL_connect
-
- - extpoll test server merged into single test server source
-
- - robustness: library should deal with all recoverable socket conditions
-
- - rx flowcontrol for backpressure notification fixed and implmeneted
-	correctly in the test server
-
- - optimal lexical parser added for header processing; all headers in a
-	single 276-byte state table
-
- - latency tracking api added (configure --with-latency)
-
- - Improved in-tree documentation, REAME.build, README.coding,
-	README.test-apps, changelog
-
- - Many small fixes
-
-
-v1.0-chrome25-firefox17 (6cd1ea9b005933f)

dependencies/libwebsockets/cmake/FindGit.cmake

@@ -1,163 +0,0 @@
-################################################################################
-#
-#  Program: 3D Slicer
-#
-#  Copyright (c) Kitware Inc.
-#
-#  See COPYRIGHT.txt
-#  or http://www.slicer.org/copyright/copyright.txt for details.
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-#  This file was originally developed by Jean-Christophe Fillion-Robin, Kitware Inc.
-#  and was partially funded by NIH grant 3P41RR013218-12S1
-#
-#  AG 2013-02-18: I got it from here
-#  https://github.com/Slicer/Slicer/blob/master/CMake/FindGit.cmake
-#  license is BSD
-#
-################################################################################
-
-#
-# The module defines the following variables:
-#   GIT_EXECUTABLE - path to git command line client
-#   GIT_FOUND - true if the command line client was found
-#
-# If the command line client executable is found the macro
-#  GIT_WC_INFO(<dir> <var-prefix>)
-# is defined to extract information of a git working copy at
-# a given location.
-#
-# The macro defines the following variables:
-#  <var-prefix>_WC_REVISION_HASH - Current SHA1 hash
-#  <var-prefix>_WC_REVISION - Current SHA1 hash
-#  <var-prefix>_WC_REVISION_NAME - Name associated with <var-prefix>_WC_REVISION_HASH
-#  <var-prefix>_WC_URL - output of command `git config --get remote.origin.url'
-#  <var-prefix>_WC_ROOT - Same value as working copy URL
-#  <var-prefix>_WC_GITSVN - Set to false
-#
-# ... and also the following ones if it's a git-svn repository:
-#  <var-prefix>_WC_GITSVN - Set to True if it is a
-#  <var-prefix>_WC_INFO - output of command `git svn info'
-#  <var-prefix>_WC_URL - url of the associated SVN repository
-#  <var-prefix>_WC_ROOT - root url of the associated SVN repository
-#  <var-prefix>_WC_REVISION - current SVN revision number
-#  <var-prefix>_WC_LAST_CHANGED_AUTHOR - author of last commit
-#  <var-prefix>_WC_LAST_CHANGED_DATE - date of last commit
-#  <var-prefix>_WC_LAST_CHANGED_REV - revision of last commit
-#  <var-prefix>_WC_LAST_CHANGED_LOG - last log of base revision
-#
-# Example usage:
-#   find_package(Git)
-#   if(GIT_FOUND)
-#    GIT_WC_INFO(${PROJECT_SOURCE_DIR} Project)
-#    message("Current revision is ${Project_WC_REVISION_HASH}")
-#    message("git found: ${GIT_EXECUTABLE}")
-#   endif()
-#
-
-# Look for 'git' or 'eg' (easy git)
-#
-set(git_names git eg)
-
-# Prefer .cmd variants on Windows unless running in a Makefile
-# in the MSYS shell.
-#
-if(WIN32)
-  if(NOT CMAKE_GENERATOR MATCHES "MSYS")
-    # Note: Due to a bug in 'git.cmd' preventing it from returning the exit code of 'git',
-    #       we excluded it from the list of executables to search.
-    # See http://code.google.com/p/msysgit/issues/detail?id=428
-    # TODO Check if 'git' exists, get the associated version, if the corresponding version
-    #      is known to have a working version of 'git.cmd', use it.
-    set(git_names git eg.cmd eg)
-  endif()
-endif()
-
-find_program(GIT_EXECUTABLE ${git_names}
-  PATHS
-    "C:/Program Files/Git/bin"
-    "C:/Program Files (x86)/Git/bin"
-  DOC "git command line client")
-mark_as_advanced(GIT_EXECUTABLE)
-
-if(GIT_EXECUTABLE)
-  macro(GIT_WC_INFO dir prefix)
-    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --verify -q --short=7 HEAD
-       WORKING_DIRECTORY ${dir}
-       ERROR_VARIABLE GIT_error
-       OUTPUT_VARIABLE ${prefix}_WC_REVISION_HASH
-       OUTPUT_STRIP_TRAILING_WHITESPACE)
-    set(${prefix}_WC_REVISION ${${prefix}_WC_REVISION_HASH})
-    if(NOT ${GIT_error} EQUAL 0)
-      message(SEND_ERROR "Command \"${GIT_EXECUTBALE} rev-parse --verify -q --short=7 HEAD\" in directory ${dir} failed with output:\n${GIT_error}")
-    else(NOT ${GIT_error} EQUAL 0)
-      execute_process(COMMAND ${GIT_EXECUTABLE} name-rev ${${prefix}_WC_REVISION_HASH}
-         WORKING_DIRECTORY ${dir}
-         OUTPUT_VARIABLE ${prefix}_WC_REVISION_NAME
-          OUTPUT_STRIP_TRAILING_WHITESPACE)
-    endif(NOT ${GIT_error} EQUAL 0)
-
-    execute_process(COMMAND ${GIT_EXECUTABLE} config --get remote.origin.url
-       WORKING_DIRECTORY ${dir}
-       OUTPUT_VARIABLE ${prefix}_WC_URL
-       OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    set(${prefix}_WC_GITSVN False)
-
-    # Check if this git is likely to be a git-svn repository
-    execute_process(COMMAND ${GIT_EXECUTABLE} config --get-regexp "^svn-remote"
-      WORKING_DIRECTORY ${dir}
-      OUTPUT_VARIABLE git_config_output
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-      )
-
-    if(NOT "${git_config_output}" STREQUAL "")
-      # In case git-svn is used, attempt to extract svn info
-      execute_process(COMMAND ${GIT_EXECUTABLE} svn info
-        WORKING_DIRECTORY ${dir}
-        TIMEOUT 3
-        ERROR_VARIABLE git_svn_info_error
-        OUTPUT_VARIABLE ${prefix}_WC_INFO
-        RESULT_VARIABLE git_svn_info_result
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-      if(${git_svn_info_result} EQUAL 0)
-        set(${prefix}_WC_GITSVN True)
-        string(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*"
-          "\\2" ${prefix}_WC_URL "${${prefix}_WC_INFO}")
-        string(REGEX REPLACE "^(.*\n)?Revision: ([^\n]+).*"
-          "\\2" ${prefix}_WC_REVISION "${${prefix}_WC_INFO}")
-        string(REGEX REPLACE "^(.*\n)?Repository Root: ([^\n]+).*"
-          "\\2" ${prefix}_WC_ROOT "${${prefix}_WC_INFO}")
-        string(REGEX REPLACE "^(.*\n)?Last Changed Author: ([^\n]+).*"
-          "\\2" ${prefix}_WC_LAST_CHANGED_AUTHOR "${${prefix}_WC_INFO}")
-        string(REGEX REPLACE "^(.*\n)?Last Changed Rev: ([^\n]+).*"
-          "\\2" ${prefix}_WC_LAST_CHANGED_REV "${${prefix}_WC_INFO}")
-        string(REGEX REPLACE "^(.*\n)?Last Changed Date: ([^\n]+).*"
-          "\\2" ${prefix}_WC_LAST_CHANGED_DATE "${${prefix}_WC_INFO}")
-      endif(${git_svn_info_result} EQUAL 0)
-    endif(NOT "${git_config_output}" STREQUAL "")
-
-    # If there is no 'remote.origin', default to "NA" value and print a warning message.
-    if(NOT ${prefix}_WC_URL)
-      message(WARNING "No remote origin set for git repository: ${dir}" )
-      set( ${prefix}_WC_URL "NA" )
-    else()
-      set(${prefix}_WC_ROOT ${${prefix}_WC_URL})
-    endif()
-
-  endmacro(GIT_WC_INFO)
-endif(GIT_EXECUTABLE)
-
-# Handle the QUIETLY and REQUIRED arguments and set GIT_FOUND to TRUE if
-# all listed variables are TRUE
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Git DEFAULT_MSG GIT_EXECUTABLE)
-
-

dependencies/libwebsockets/cmake/FindOpenSSLbins.cmake

@@ -1,42 +0,0 @@
-
-if(OPENSSL_FOUND)
-
-	find_program(OPENSSL_EXECUTABLE openssl openssl.exe bin/openssl.exe
-		HINTS ${_OPENSSL_ROOT_HINTS}
-		PATH 
-			/usr/bin/ 
-			bin/
-	  	DOC "Openssl executable")
-
-	mark_as_advanced(OPENSSL_EXECUTABLE)
-	
-	# On Windows, we need to copy the OpenSSL dlls 
-	# to the output directory.
-	if(WIN32)
-		set(OPENSSL_BIN_FOUND 0)
-
-		find_file(LIBEAY_BIN
-			NAMES
-			libeay32.dll
-			HINTS
-			${_OPENSSL_ROOT_HINTS}
-			PATH_SUFFIXES
-			bin)
-		
-		find_file(SSLEAY_BIN
-			NAMES
-			ssleay32.dll
-			HINTS
-			${_OPENSSL_ROOT_HINTS}
-			PATH_SUFFIXES
-			bin)
-		
-		if(LIBEAY_BIN)
-			if(SSLEAY_BIN)
-				set(OPENSSL_BIN_FOUND 1)
-			endif(SSLEAY_BIN)
-		endif(LIBEAY_BIN)
-	endif(WIN32)
-		
-endif(OPENSSL_FOUND)
-

dependencies/libwebsockets/cmake/LibwebsocketsConfig.cmake.in

@@ -1,17 +0,0 @@
-# - Config file for the Libevent package
-# It defines the following variables
-#  LIBWEBSOCKETS_INCLUDE_DIRS - include directories for FooBar
-#  LIBWEBSOCKETS_LIBRARIES    - libraries to link against
-
-# Get the path of the current file.
-get_filename_component(LWS_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-
-# Set the include directories.
-set(LIBWEBSOCKETS_INCLUDE_DIRS "@LWS__INCLUDE_DIRS@")
-
-# Include the project Targets file, this contains definitions for IMPORTED targets.
-include(${LWS_CMAKE_DIR}/LibwebsocketsTargets.cmake)
-
-# IMPORTED targets from LibwebsocketsTargets.cmake
-set(LIBWEBSOCKETS_LIBRARIES websockets websockets_shared)
-

dependencies/libwebsockets/cmake/LibwebsocketsConfigVersion.cmake.in

@@ -1,11 +0,0 @@
-set(PACKAGE_VERSION "@CPACK_PACKAGE_VERSION@")
-
-# Check whether the requested PACKAGE_FIND_VERSION is compatible
-if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
-  set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else()
-  set(PACKAGE_VERSION_COMPATIBLE TRUE)
-  if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
-    set(PACKAGE_VERSION_EXACT TRUE)
-  endif()
-endif()	

dependencies/libwebsockets/cmake/UseRPMTools.cmake

@@ -1,176 +0,0 @@
-#
-# - Find tools needed for building RPM Packages
-#   on Linux systems and defines macro that helps to
-#   build source or binary RPM, the MACRO assumes
-#   CMake 2.4.x which includes CPack support.
-#   CPack is used to build tar.gz source tarball
-#   which may be used by a custom user-made spec file.
-#
-# - Define RPMTools_ADD_RPM_TARGETS which defines
-#   two (top-level) CUSTOM targets for building
-#   source and binary RPMs
-#
-# Those CMake macros are provided by the TSP Developer Team
-# https://savannah.nongnu.org/projects/tsp
-#
-
-IF (WIN32)
-  MESSAGE(STATUS "RPM tools not available on Win32 systems")
-ENDIF(WIN32)
-
-IF (UNIX)
-  # Look for RPM builder executable
-  FIND_PROGRAM(RPMTools_RPMBUILD_EXECUTABLE
-    NAMES rpmbuild
-    PATHS "/usr/bin;/usr/lib/rpm"
-    PATH_SUFFIXES bin
-    DOC "The RPM builder tool")
-
-  IF (RPMTools_RPMBUILD_EXECUTABLE)
-    MESSAGE(STATUS "Looking for RPMTools... - found rpmuild is ${RPMTools_RPMBUILD_EXECUTABLE}")
-    SET(RPMTools_RPMBUILD_FOUND "YES")
-    GET_FILENAME_COMPONENT(RPMTools_BINARY_DIRS ${RPMTools_RPMBUILD_EXECUTABLE} PATH)
-  ELSE (RPMTools_RPMBUILD_EXECUTABLE)
-    SET(RPMTools_RPMBUILD_FOUND "NO")
-    MESSAGE(STATUS "Looking for RPMTools... - rpmbuild NOT FOUND")
-  ENDIF (RPMTools_RPMBUILD_EXECUTABLE)
-
-  # Detect if CPack was included or not
-  IF (NOT DEFINED "CPACK_PACKAGE_NAME")
-    MESSAGE(FATAL_ERROR "CPack was not included, you should include CPack before Using RPMTools")
-  ENDIF (NOT DEFINED "CPACK_PACKAGE_NAME")
-
-  IF (RPMTools_RPMBUILD_FOUND)
-    SET(RPMTools_FOUND TRUE)
-    #
-    # - first arg  (ARGV0) is RPM name
-    # - second arg (ARGV1) is the RPM spec file path [optional]
-    # - third arg  (ARGV2) is the RPM ROOT DIRECTORY used to build RPMs [optional]
-    #
-    MACRO(RPMTools_ADD_RPM_TARGETS RPMNAME)
-
-      #
-      # If no spec file is provided create a minimal one
-      #
-      IF ("${ARGV1}" STREQUAL "")
-	SET(SPECFILE_PATH "${CMAKE_BINARY_DIR}/${RPMNAME}.spec")
-      ELSE ("${ARGV1}" STREQUAL "")
-	SET(SPECFILE_PATH "${ARGV1}")
-      ENDIF("${ARGV1}" STREQUAL "")
-
-      # Verify whether if RPM_ROOTDIR was provided or not
-      IF("${ARGV2}" STREQUAL "")
-	SET(RPM_ROOTDIR ${CMAKE_BINARY_DIR}/RPM)
-      ELSE ("${ARGV2}" STREQUAL "")
-	SET(RPM_ROOTDIR "${ARGV2}")
-      ENDIF("${ARGV2}" STREQUAL "")
-      MESSAGE(STATUS "RPMTools:: Using RPM_ROOTDIR=${RPM_ROOTDIR}")
-
-      # Prepare RPM build tree
-      FILE(MAKE_DIRECTORY ${RPM_ROOTDIR})
-      FILE(MAKE_DIRECTORY ${RPM_ROOTDIR}/tmp)
-      FILE(MAKE_DIRECTORY ${RPM_ROOTDIR}/BUILD)
-      FILE(MAKE_DIRECTORY ${RPM_ROOTDIR}/RPMS)
-      FILE(MAKE_DIRECTORY ${RPM_ROOTDIR}/SOURCES)
-      FILE(MAKE_DIRECTORY ${RPM_ROOTDIR}/SPECS)
-      FILE(MAKE_DIRECTORY ${RPM_ROOTDIR}/SRPMS)
-
-      #
-      # We check whether if the provided spec file is
-      # to be configure or not.
-      #
-      IF ("${ARGV1}" STREQUAL "")
-	SET(SPECFILE_PATH "${RPM_ROOTDIR}/SPECS/${RPMNAME}.spec")
-	SET(SPECFILE_NAME "${RPMNAME}.spec")
-	MESSAGE(STATUS "No Spec file given generate a minimal one --> ${RPM_ROOTDIR}/SPECS/${RPMNAME}.spec")
-      	FILE(WRITE ${RPM_ROOTDIR}/SPECS/${RPMNAME}.spec
-	  "# -*- rpm-spec -*-
-Summary:        ${RPMNAME}
-Name:           ${RPMNAME}
-Version:        ${CPACK_PACKAGE_VERSION}
-Release:        1
-License:        Unknown
-Group:          Unknown
-Source:         ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{CPACK_PACKAGE_VERSION}-1-root
-BuildRequires:	cmake
-
-%define prefix /opt/${RPMNAME}-%{version}
-%define rpmprefix $RPM_BUILD_ROOT%{prefix}
-%define srcdirname %{name}-%{version}
-
-%description
-${RPMNAME} : No description for now
-
-%prep
-%setup -q -n %{srcdirname}
-
-%build
-cd ..
-rm -rf build_tree
-mkdir build_tree
-cd build_tree
-cmake -DCMAKE_INSTALL_PREFIX=%{rpmprefix} ../%{srcdirname}
-make
-
-%install
-cd ../build_tree
-make install
-
-%clean
-rm -rf %{srcdirname}
-rm -rf build_tree
-
-%files
-%defattr(-,root,root,-)
-%dir %{prefix}
-%{prefix}/*
-
-%changelog
-* Wed Feb 28 2007 Erk <eric.noulard@gmail.com>
-  Generated by CMake UseRPMTools macros"
-	)
-
-      ELSE ("${ARGV1}" STREQUAL "")
-	SET(SPECFILE_PATH "${ARGV1}")
-
-	GET_FILENAME_COMPONENT(SPECFILE_EXT ${SPECFILE_PATH} EXT)
-	IF ("${SPECFILE_EXT}" STREQUAL ".spec")
-	  # This is a 'ready-to-use' spec file which does not need to be CONFIGURED
-	  GET_FILENAME_COMPONENT(SPECFILE_NAME ${SPECFILE_PATH} NAME)
-	  MESSAGE(STATUS "Simple copy spec file <${SPECFILE_PATH}> --> <${RPM_ROOTDIR}/SPECS/${SPECFILE_NAME}>")
-	  CONFIGURE_FILE(
-	    ${SPECFILE_PATH}
-	    ${RPM_ROOTDIR}/SPECS/${SPECFILE_NAME}
-	    COPYONLY)
-	ELSE ("${SPECFILE_EXT}" STREQUAL ".spec")
-	  # This is a to-be-configured spec file
-	  GET_FILENAME_COMPONENT(SPECFILE_NAME ${SPECFILE_PATH} NAME_WE)
-	  SET(SPECFILE_NAME "${SPECFILE_NAME}.spec")
-	  MESSAGE(STATUS "Configuring spec file <${SPECFILE_PATH}> --> <${RPM_ROOTDIR}/SPECS/${SPECFILE_NAME}>")
-	  CONFIGURE_FILE(
-	    ${SPECFILE_PATH}
-	    ${RPM_ROOTDIR}/SPECS/${SPECFILE_NAME}
-	    @ONLY)
-	ENDIF ("${SPECFILE_EXT}" STREQUAL ".spec")
-      ENDIF("${ARGV1}" STREQUAL "")
-
-      ADD_CUSTOM_TARGET(${RPMNAME}_srpm
-	COMMAND cpack -G TGZ --config CPackSourceConfig.cmake
-	COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz ${RPM_ROOTDIR}/SOURCES
-	COMMAND ${RPMTools_RPMBUILD_EXECUTABLE} -bs --define=\"_topdir ${RPM_ROOTDIR}\" --buildroot=${RPM_ROOTDIR}/tmp ${RPM_ROOTDIR}/SPECS/${SPECFILE_NAME}
-	)
-
-      ADD_CUSTOM_TARGET(${RPMNAME}_rpm
-	COMMAND cpack -G TGZ --config CPackSourceConfig.cmake
-	COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz ${RPM_ROOTDIR}/SOURCES
-	COMMAND ${RPMTools_RPMBUILD_EXECUTABLE} -bb --define=\"_topdir ${RPM_ROOTDIR}\" --buildroot=${RPM_ROOTDIR}/tmp ${RPM_ROOTDIR}/SPECS/${SPECFILE_NAME}
-	)
-    ENDMACRO(RPMTools_ADD_RPM_TARGETS)
-
-  ELSE (RPMTools_RPMBUILD_FOUND)
-    SET(RPMTools FALSE)
-  ENDIF (RPMTools_RPMBUILD_FOUND)
-
-ENDIF (UNIX)
-

dependencies/libwebsockets/config.h.cmake

@@ -1,174 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-#ifndef WIN32
-#cmakedefine _DEBUG
-#endif
-
-/* Define to 1 to use CyaSSL as a replacement for OpenSSL. 
- * LWS_OPENSSL_SUPPORT needs to be set also for this to work. */
-#cmakedefine USE_CYASSL
-
-/* The Libwebsocket version */
-#cmakedefine LWS_LIBRARY_VERSION "${LWS_LIBRARY_VERSION}"
-
-/* The current git commit hash that we're building from */
-#cmakedefine LWS_BUILD_HASH "${LWS_BUILD_HASH}"
-
-/* Build with OpenSSL support */
-#cmakedefine LWS_OPENSSL_SUPPORT
-
-/* The client should load and trust CA root certs it finds in the OS */
-#cmakedefine LWS_SSL_CLIENT_USE_OS_CA_CERTS
-
-/* Sets the path where the client certs should be installed. */
-#cmakedefine LWS_OPENSSL_CLIENT_CERTS "${LWS_OPENSSL_CLIENT_CERTS}"
-
-/* Turn off websocket extensions */
-#cmakedefine LWS_NO_EXTENSIONS
-
-/* Enable libev io loop */
-#cmakedefine LWS_USE_LIBEV
-
-/* Build with support for ipv6 */
-#cmakedefine LWS_USE_IPV6
-
-/* Build with support for HTTP2 */
-#cmakedefine LWS_USE_HTTP2
-
-/* Turn on latency measuring code */
-#cmakedefine LWS_LATENCY
-
-/* Don't build the daemonizeation api */
-#cmakedefine LWS_NO_DAEMONIZE
-
-/* Build without server support */
-#cmakedefine LWS_NO_SERVER
-
-/* Build without client support */
-#cmakedefine LWS_NO_CLIENT
-
-/* If we should compile with MinGW support */
-#cmakedefine LWS_MINGW_SUPPORT
-
-/* Use the BSD getifaddrs that comes with libwebsocket, for uclibc support */
-#cmakedefine LWS_BUILTIN_GETIFADDRS
-
-/* Define to 1 if you have the `bzero' function. */
-#cmakedefine HAVE_BZERO
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#cmakedefine HAVE_DLFCN_H
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#cmakedefine HAVE_FCNTL_H
-
-/* Define to 1 if you have the `fork' function. */
-#cmakedefine HAVE_FORK
-
-/* Define to 1 if you have the `getenv’ function. */
-#cmakedefine HAVE_GETENV
-
-/* Define to 1 if you have the <in6addr.h> header file. */
-#cmakedefine HAVE_IN6ADDR_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#cmakedefine HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `ssl' library (-lssl). */
-//#cmakedefine HAVE_LIBSSL
-
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
-   to 0 otherwise. */
-#cmakedefine HAVE_MALLOC
-
-/* Define to 1 if you have the <memory.h> header file. */
-#cmakedefine HAVE_MEMORY_H
-
-/* Define to 1 if you have the `memset' function. */
-#cmakedefine HAVE_MEMSET
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#cmakedefine HAVE_NETINET_IN_H
-
-/* Define to 1 if your system has a GNU libc compatible `realloc' function,
-   and to 0 otherwise. */
-#cmakedefine HAVE_REALLOC
-
-/* Define to 1 if you have the `socket' function. */
-#cmakedefine HAVE_SOCKET
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#cmakedefine HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#cmakedefine HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strerror' function. */
-#cmakedefine HAVE_STRERROR
-
-/* Define to 1 if you have the <strings.h> header file. */
-#cmakedefine HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#cmakedefine HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/prctl.h> header file. */
-#cmakedefine HAVE_SYS_PRCTL_H
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#cmakedefine HAVE_SYS_SOCKET_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#cmakedefine HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#cmakedefine HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#cmakedefine HAVE_UNISTD_H
-
-/* Define to 1 if you have the `vfork' function. */
-#cmakedefine HAVE_VFORK
-
-/* Define to 1 if you have the <vfork.h> header file. */
-#cmakedefine HAVE_VFORK_H
-
-/* Define to 1 if `fork' works. */
-#cmakedefine HAVE_WORKING_FORK
-
-/* Define to 1 if `vfork' works. */
-#cmakedefine HAVE_WORKING_VFORK
-
-/* Define to 1 if you have the <zlib.h> header file. */
-#cmakedefine HAVE_ZLIB_H
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR // We're not using libtool
-
-/* Define to 1 if you have the ANSI C header files. */
-#cmakedefine STDC_HEADERS
-
-/* Version number of package */
-#cmakedefine VERSION
-
-/* Define to rpl_malloc if the replacement function should be used. */
-#cmakedefine malloc
-
-/* Define to `int' if <sys/types.h> does not define. */
-#cmakedefine pid_t
-
-/* Define to rpl_realloc if the replacement function should be used. */
-#cmakedefine realloc
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#cmakedefine size_t
-
-/* Define to 1 if we have getifaddrs */
-#cmakedefine HAVE_GETIFADDRS
-
-/* Define as `fork' if `vfork' does not work. */
-//#cmakedefine vfork
-
-/* Define if the inline keyword doesn't exist. */
-#cmakedefine inline

dependencies/libwebsockets/cross-arm-linux-gnueabihf.cmake

@@ -1,28 +0,0 @@
-#
-# CMake Toolchain file for crosscompiling on ARM.
-#
-# This can be used when running cmake in the following way:
-#  cd build/
-#  cmake .. -DCMAKE_TOOLCHAIN_FILE=../cross-arm-linux-gnueabihf.cmake
-#
-
-set(CROSS_PATH /opt/gcc-linaro-arm-linux-gnueabihf-4.7-2013.02-01-20130221_linux)
-
-# Target operating system name.
-set(CMAKE_SYSTEM_NAME Linux)
-
-# Name of C compiler.
-set(CMAKE_C_COMPILER "${CROSS_PATH}/bin/arm-linux-gnueabihf-gcc")
-set(CMAKE_CXX_COMPILER "${CROSS_PATH}/bin/arm-linux-gnueabihf-g++")
-
-# Where to look for the target environment. (More paths can be added here)
-set(CMAKE_FIND_ROOT_PATH "${CROSS_PATH}")
-
-# Adjust the default behavior of the FIND_XXX() commands:
-# search programs in the host environment only.
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-
-# Search headers and libraries in the target environment only.
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-

dependencies/libwebsockets/cross-ming.cmake

@@ -1,31 +0,0 @@
-#
-# CMake Toolchain file for crosscompiling on MingW.
-#
-# This can be used when running cmake in the following way:
-#  cd build/
-#  cmake .. -DCMAKE_TOOLCHAIN_FILE=../cross-ming.cmake
-#
-
-set(CROSS_PATH /usr/bin)
-
-# Target operating system name.
-set(CMAKE_SYSTEM_NAME Windows)
-set(BUILD_SHARED_LIBS OFF)
-
-# Name of C compiler.
-set(CMAKE_C_COMPILER "${CROSS_PATH}/x86_64-w64-mingw32-gcc")
-#set(CMAKE_CXX_COMPILER "${CROSS_PATH}/x86_64-w64-mingw32-g++")
-set(CMAKE_RC_COMPILER "${CROSS_PATH}/x86_64-w64-mingw32-windres")
-set(CMAKE_C_FLAGS "-Wno-error")
-
-# Where to look for the target environment. (More paths can be added here)
-set(CMAKE_FIND_ROOT_PATH "${CROSS_PATH}")
-
-# Adjust the default behavior of the FIND_XXX() commands:
-# search programs in the host environment only.
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-
-# Search headers and libraries in the target environment only.
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-

dependencies/libwebsockets/cross-openwrt-makefile

@@ -1,91 +0,0 @@
-#
-# libwebsockets makefile for openwrt
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libwebsockets
-PKG_VERSION:=2014-03-01
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/warmcat/libwebsockets.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=388dc7d201d8d123841869fb49ec4d94d6dd7f54
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-CMAKE_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-CMAKE_OPTIONS += -DLWS_OPENSSL_CLIENT_CERTS=/etc/ssl/certs
-CMAKE_OPTIONS += -DLWS_OPENSSL_SUPPORT=ON
-CMAKE_OPTIONS += -DLWS_WITH_SSL=ON
-CMAKE_OPTIONS += -DLWS_WITHOUT_TESTAPPS=$(if $(CONFIG_PACKAGE_libwebsockets-examples),"OFF","ON")
-
-# for cyassl, define these in addition to LWS_OPENSSL_SUPPORT and
-# edit package/libs/cyassl/Makefile to include --enable-opensslextra
-# CMAKE_OPTIONS += -DLWS_USE_CYASSL=ON
-# CMAKE_OPTIONS += -DLWS_CYASSL_LIB=$(STAGING_DIR)/usr/lib/libcyassl.so
-# CMAKE_OPTIONS += -DLWS_CYASSL_INCLUDE_DIRS=$(STAGING_DIR)/usr/include
-
-# other options worth noting
-# CMAKE_OPTIONS += -DLWS_WITHOUT_EXTENSIONS=ON
-# CMAKE_OPTIONS += -DLWS_WITHOUT_DAEMONIZE=ON
-# CMAKE_OPTIONS += -DLWS_WITHOUT_SERVER=ON
-# CMAKE_OPTIONS += -DLWS_WITHOUT_DEBUG=ON
-
-
-define Package/libwebsockets/Default
-	SECTION:=libs
-	CATEGORY:=Libraries
-	TITLE:=libwebsockets
-	DEPENDS:=+zlib +libopenssl
-endef
-
-define Package/libwebsockets
-	$(call Package/libwebsockets/Default)
-	TITLE+= (libraries)
-endef
-
-define Package/libwebsockets/description
-	libwebsockets
-	This package contains libwebsocket libraries
-endef
-
-define Package/libwebsockets-examples
-	$(call Package/libwebsockets/Default)
-	DEPENDS:=libwebsockets
-	TITLE+= (examples)
-endef
-
-define Package/libwebsockets-examples/description
-	libwebsockets examples
-	This package contains libwebsockets examples
-endef
-
-define Package/libwebsockets/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebsockets.so* $(1)/usr/lib/
-endef
-
-define Package/libwebsockets-examples/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-client $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-echo $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-fraggle $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-ping $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-server $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libwebsockets-test-server-extpoll $(1)/usr/bin/
-
-	$(INSTALL_DIR) $(1)/usr/share/libwebsockets-test-server
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test-server/favicon.ico $(1)/usr/share/libwebsockets-test-server/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test-server/leaf.jpg $(1)/usr/share/libwebsockets-test-server/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test-server/libwebsockets.org-logo.png $(1)/usr/share/libwebsockets-test-server/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test-server/libwebsockets-test-server.key.pem $(1)/usr/share/libwebsockets-test-server/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test-server/libwebsockets-test-server.pem $(1)/usr/share/libwebsockets-test-server/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libwebsockets-test-server/test.html $(1)/usr/share/libwebsockets-test-server/
-endef
-
-$(eval $(call BuildPackage,libwebsockets))
-$(eval $(call BuildPackage,libwebsockets-examples))

dependencies/libwebsockets/lib/.gitignore

@@ -1,8 +0,0 @@
-#Ignore build files
-Makefile
-*.o
-*.lo
-*.la
-.libs
-.deps
-

dependencies/libwebsockets/lib/base64-decode.c

@@ -1,93 +0,0 @@
-/*
- * This code originally came from here
- *
- * http://base64.sourceforge.net/b64.c
- *
- * with the following license:
- *
- * LICENCE:        Copyright (c) 2001 Bob Trower, Trantor Standard Systems Inc.
- *
- *                Permission is hereby granted, free of charge, to any person
- *                obtaining a copy of this software and associated
- *                documentation files (the "Software"), to deal in the
- *                Software without restriction, including without limitation
- *                the rights to use, copy, modify, merge, publish, distribute,
- *                sublicense, and/or sell copies of the Software, and to
- *                permit persons to whom the Software is furnished to do so,
- *                subject to the following conditions:
- *
- *                The above copyright notice and this permission notice shall
- *                be included in all copies or substantial portions of the
- *                Software.
- *
- *                THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- *                KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
- *                WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- *                PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- *                OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- *                OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- *                OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- *                SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * VERSION HISTORY:
- *               Bob Trower 08/04/01 -- Create Version 0.00.00B
- *
- * I cleaned it up quite a bit to match the (linux kernel) style of the rest
- * of libwebsockets; this version is under LGPL2 like the rest of libwebsockets
- * since he explictly allows sublicensing, but I give the URL above so you can
- * get the original with Bob's super-liberal terms directly if you prefer.
- */
-
-
-#include <stdio.h>
-#include <string.h>
-#include "private-libwebsockets.h"
-
-static const char encode[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-			     "abcdefghijklmnopqrstuvwxyz0123456789+/";
-static const char decode[] = "|$$$}rstuvwxyz{$$$$$$$>?@ABCDEFGHIJKLMNOPQRSTUVW"
-			     "$$$$$$XYZ[\\]^_`abcdefghijklmnopq";
-
-LWS_VISIBLE int
-lws_b64_encode_string(const char *in, int in_len, char *out, int out_size)
-{
-	unsigned char triple[3];
-	int i;
-	int len;
-	int line = 0;
-	int done = 0;
-
-	while (in_len) {
-		len = 0;
-		for (i = 0; i < 3; i++) {
-			if (in_len) {
-				triple[i] = *in++;
-				len++;
-				in_len--;
-			} else
-				triple[i] = 0;
-		}
-		if (!len)
-			continue;
-
-		if (done + 4 >= out_size)
-			return -1;
-
-		*out++ = encode[triple[0] >> 2];
-		*out++ = encode[((triple[0] & 0x03) << 4) |
-					     ((triple[1] & 0xf0) >> 4)];
-		*out++ = (len > 1 ? encode[((triple[1] & 0x0f) << 2) |
-					     ((triple[2] & 0xc0) >> 6)] : '=');
-		*out++ = (len > 2 ? encode[triple[2] & 0x3f] : '=');
-
-		done += 4;
-		line += 4;
-	}
-
-	if (done + 1 >= out_size)
-		return -1;
-
-	*out++ = '\0';
-
-	return done;
-}

dependencies/libwebsockets/lib/client-handshake.c

@@ -1,443 +0,0 @@
-#include "private-libwebsockets.h"
-
-struct libwebsocket *libwebsocket_client_connect_2(
-	struct libwebsocket_context *context,
-	struct libwebsocket *wsi
-) {
-	struct libwebsocket_pollfd pfd;
-#ifdef LWS_USE_IPV6
-	struct sockaddr_in6 server_addr6;
-	struct sockaddr_in6 client_addr6;
-	struct addrinfo hints, *result;
-#endif
-	struct sockaddr_in server_addr4;
-	struct sockaddr_in client_addr4;
-	struct hostent *server_hostent;
-
-	struct sockaddr *v;
-	int n;
-	int plen = 0;
-	const char *ads;
-
-       lwsl_client("libwebsocket_client_connect_2\n");
-
-	/*
-	 * proxy?
-	 */
-
-	if (context->http_proxy_port) {
-		plen = sprintf((char *)context->service_buffer,
-			"CONNECT %s:%u HTTP/1.0\x0d\x0a"
-			"User-agent: libwebsockets\x0d\x0a"
-/*Proxy-authorization: basic aGVsbG86d29ybGQ= */
-			"\x0d\x0a",
-			lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_PEER_ADDRESS),
-			wsi->u.hdr.ah->c_port);
-		ads = context->http_proxy_address;
-
-#ifdef LWS_USE_IPV6
-		if (LWS_IPV6_ENABLED(context))
-			server_addr6.sin6_port = htons(context->http_proxy_port);
-		else
-#endif
-			server_addr4.sin_port = htons(context->http_proxy_port);
-
-	} else {
-		ads = lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_PEER_ADDRESS);
-#ifdef LWS_USE_IPV6
-		if (LWS_IPV6_ENABLED(context))
-			server_addr6.sin6_port = htons(wsi->u.hdr.ah->c_port);
-		else
-#endif
-			server_addr4.sin_port = htons(wsi->u.hdr.ah->c_port);
-	}
-
-	/*
-	 * prepare the actual connection (to the proxy, if any)
-	 */
-       lwsl_client("libwebsocket_client_connect_2: address %s\n", ads);
-
-#ifdef LWS_USE_IPV6
-	if (LWS_IPV6_ENABLED(context)) {
-		memset(&hints, 0, sizeof(struct addrinfo));
-		n = getaddrinfo(ads, NULL, &hints, &result);
-		if (n) {
-#ifdef _WIN32
-			lwsl_err("getaddrinfo: %ls\n", gai_strerrorW(n));
-#else
-			lwsl_err("getaddrinfo: %s\n", gai_strerror(n));
-#endif
-			goto oom4;
-		}
-
-		server_addr6.sin6_family = AF_INET6;
-		switch (result->ai_family) {
-		case AF_INET:
-			/* map IPv4 to IPv6 */
-			bzero((char *)&server_addr6.sin6_addr,
-						sizeof(struct in6_addr));
-			server_addr6.sin6_addr.s6_addr[10] = 0xff;
-			server_addr6.sin6_addr.s6_addr[11] = 0xff;
-			memcpy(&server_addr6.sin6_addr.s6_addr[12],
-				&((struct sockaddr_in *)result->ai_addr)->sin_addr,
-							sizeof(struct in_addr));
-			break;
-		case AF_INET6:
-			memcpy(&server_addr6.sin6_addr,
-			  &((struct sockaddr_in6 *)result->ai_addr)->sin6_addr,
-						sizeof(struct in6_addr));
-			break;
-		default:
-			lwsl_err("Unknown address family\n");
-			freeaddrinfo(result);
-			goto oom4;
-		}
-
-		freeaddrinfo(result);
-	} else
-#endif
-	{
-		server_hostent = gethostbyname(ads);
-		if (!server_hostent) {
-			lwsl_err("Unable to get host name from %s\n", ads);
-			goto oom4;
-		}
-
-		server_addr4.sin_family = AF_INET;
-		server_addr4.sin_addr =
-				*((struct in_addr *)server_hostent->h_addr);
-		bzero(&server_addr4.sin_zero, 8);
-	}
-
-	if (wsi->sock < 0) {
-
-#ifdef LWS_USE_IPV6
-		if (LWS_IPV6_ENABLED(context))
-			wsi->sock = socket(AF_INET6, SOCK_STREAM, 0);
-		else
-#endif
-			wsi->sock = socket(AF_INET, SOCK_STREAM, 0);
-
-		if (wsi->sock < 0) {
-			lwsl_warn("Unable to open socket\n");
-			goto oom4;
-		}
-
-		if (lws_plat_set_socket_options(context, wsi->sock)) {
-			lwsl_err("Failed to set wsi socket options\n");
-			compatible_close(wsi->sock);
-			goto oom4;
-		}
-
-		wsi->mode = LWS_CONNMODE_WS_CLIENT_WAITING_CONNECT;
-
-		insert_wsi_socket_into_fds(context, wsi);
-
-		libwebsocket_set_timeout(wsi,
-			PENDING_TIMEOUT_AWAITING_CONNECT_RESPONSE,
-							      AWAITING_TIMEOUT);
-#ifdef LWS_USE_IPV6
-		if (LWS_IPV6_ENABLED(context)) {
-			v = (struct sockaddr *)&client_addr6;
-			n = sizeof(client_addr6);
-			bzero((char *)v, n);
-			client_addr6.sin6_family = AF_INET6;
-		} else
-#endif
-		{
-			v = (struct sockaddr *)&client_addr4;
-			n = sizeof(client_addr4);
-			bzero((char *)v, n);
-			client_addr4.sin_family = AF_INET;
-		}
-
-		if (context->iface) {
-			if (interface_to_sa(context, context->iface,
-					(struct sockaddr_in *)v, n) < 0) {
-				lwsl_err("Unable to find interface %s\n",
-								context->iface);
-				compatible_close(wsi->sock);
-				goto failed;
-			}
-
-			if (bind(wsi->sock, v, n) < 0) {
-				lwsl_err("Error binding to interface %s",
-								context->iface);
-				compatible_close(wsi->sock);
-				goto failed;
-			}
-		}
-	}
-
-#ifdef LWS_USE_IPV6
-	if (LWS_IPV6_ENABLED(context)) {
-		v = (struct sockaddr *)&server_addr6;
-		n = sizeof(struct sockaddr_in6);
-	} else
-#endif
-	{
-		v = (struct sockaddr *)&server_addr4;
-		n = sizeof(struct sockaddr);
-	}
-
-	if (connect(wsi->sock, v, n) == -1 || LWS_ERRNO == LWS_EISCONN) {
-
-		if (LWS_ERRNO == LWS_EALREADY || LWS_ERRNO == LWS_EINPROGRESS
-		                              || LWS_ERRNO == LWS_EWOULDBLOCK) {
-			lwsl_client("nonblocking connect retry\n");
-
-			/*
-			 * must do specifically a POLLOUT poll to hear
-			 * about the connect completion
-			 */
-			if (lws_change_pollfd(wsi, 0, LWS_POLLOUT))
-				goto oom4;
-
-			return wsi;
-		}
-
-		if (LWS_ERRNO != LWS_EISCONN) {
-			lwsl_debug("Connect failed errno=%d\n", LWS_ERRNO);
-			goto failed;
-		}
-	}
-
-	lwsl_client("connected\n");
-
-	/* we are connected to server, or proxy */
-
-	if (context->http_proxy_port) {
-
-		/* OK from now on we talk via the proxy, so connect to that */
-
-		/*
-		 * (will overwrite existing pointer,
-		 * leaving old string/frag there but unreferenced)
-		 */
-		if (lws_hdr_simple_create(wsi, _WSI_TOKEN_CLIENT_PEER_ADDRESS,
-						   context->http_proxy_address))
-			goto failed;
-		wsi->u.hdr.ah->c_port = context->http_proxy_port;
-
-		n = send(wsi->sock, context->service_buffer, plen, MSG_NOSIGNAL);
-		if (n < 0) {
-			lwsl_debug("ERROR writing to proxy socket\n");
-			goto failed;
-		}
-
-		libwebsocket_set_timeout(wsi,
-			PENDING_TIMEOUT_AWAITING_PROXY_RESPONSE,
-							      AWAITING_TIMEOUT);
-
-		wsi->mode = LWS_CONNMODE_WS_CLIENT_WAITING_PROXY_REPLY;
-
-		return wsi;
-	}
-
-	/*
-	 * provoke service to issue the handshake directly
-	 * we need to do it this way because in the proxy case, this is the
-	 * next state and executed only if and when we get a good proxy
-	 * response inside the state machine... but notice in SSL case this
-	 * may not have sent anything yet with 0 return, and won't until some
-	 * many retries from main loop.  To stop that becoming endless,
-	 * cover with a timeout.
-	 */
-
-	libwebsocket_set_timeout(wsi,
-		PENDING_TIMEOUT_SENT_CLIENT_HANDSHAKE, AWAITING_TIMEOUT);
-
-	wsi->mode = LWS_CONNMODE_WS_CLIENT_ISSUE_HANDSHAKE;
-	pfd.fd = wsi->sock;
-	pfd.revents = LWS_POLLIN;
-
-	n = libwebsocket_service_fd(context, &pfd);
-
-	if (n < 0)
-		goto failed;
-
-	if (n) /* returns 1 on failure after closing wsi */
-		return NULL;
-
-	return wsi;
-
-oom4:
-	free(wsi->u.hdr.ah);
-	free(wsi);
-	return NULL;
-
-failed:
-	libwebsocket_close_and_free_session(context, wsi,
-						     LWS_CLOSE_STATUS_NOSTATUS);
-	return NULL;
-}
-
-/**
- * libwebsocket_client_connect() - Connect to another websocket server
- * @context:	Websocket context
- * @address:	Remote server address, eg, "myserver.com"
- * @port:	Port to connect to on the remote server, eg, 80
- * @ssl_connection:	0 = ws://, 1 = wss:// encrypted, 2 = wss:// allow self
- *			signed certs
- * @path:	Websocket path on server
- * @host:	Hostname on server
- * @origin:	Socket origin name
- * @protocol:	Comma-separated list of protocols being asked for from
- *		the server, or just one.  The server will pick the one it
- *		likes best.
- * @ietf_version_or_minus_one: -1 to ask to connect using the default, latest
- *		protocol supported, or the specific protocol ordinal
- *
- *	This function creates a connection to a remote server
- */
-
-LWS_VISIBLE struct libwebsocket *
-libwebsocket_client_connect(struct libwebsocket_context *context,
-			      const char *address,
-			      int port,
-			      int ssl_connection,
-			      const char *path,
-			      const char *host,
-			      const char *origin,
-			      const char *protocol,
-			      int ietf_version_or_minus_one)
-{
-	struct libwebsocket *wsi;
-
-	wsi = (struct libwebsocket *) malloc(sizeof(struct libwebsocket));
-	if (wsi == NULL)
-		goto bail;
-
-	memset(wsi, 0, sizeof(*wsi));
-	wsi->sock = -1;
-
-	/* -1 means just use latest supported */
-
-	if (ietf_version_or_minus_one == -1)
-		ietf_version_or_minus_one = SPEC_LATEST_SUPPORTED;
-
-	wsi->ietf_spec_revision = ietf_version_or_minus_one;
-	wsi->user_space = NULL;
-	wsi->state = WSI_STATE_CLIENT_UNCONNECTED;
-	wsi->protocol = NULL;
-	wsi->pending_timeout = NO_PENDING_TIMEOUT;
-
-#ifdef LWS_OPENSSL_SUPPORT
-	wsi->use_ssl = ssl_connection;
-#else
-	if (ssl_connection) {
-		lwsl_err("libwebsockets not configured for ssl\n");
-		goto bail;
-	}
-#endif
-
-	if (lws_allocate_header_table(wsi))
-		goto bail;
-
-	/*
-	 * we're not necessarily in a position to action these right away,
-	 * stash them... we only need during connect phase so u.hdr is fine
-	 */
-	wsi->u.hdr.ah->c_port = port;
-	if (lws_hdr_simple_create(wsi, _WSI_TOKEN_CLIENT_PEER_ADDRESS, address))
-		goto bail1;
-
-	/* these only need u.hdr lifetime as well */
-
-	if (lws_hdr_simple_create(wsi, _WSI_TOKEN_CLIENT_URI, path))
-		goto bail1;
-
-	if (lws_hdr_simple_create(wsi, _WSI_TOKEN_CLIENT_HOST, host))
-		goto bail1;
-
-	if (origin)
-		if (lws_hdr_simple_create(wsi,
-				_WSI_TOKEN_CLIENT_ORIGIN, origin))
-			goto bail1;
-	/*
-	 * this is a list of protocols we tell the server we're okay with
-	 * stash it for later when we compare server response with it
-	 */
-	if (protocol)
-		if (lws_hdr_simple_create(wsi,
-				_WSI_TOKEN_CLIENT_SENT_PROTOCOLS, protocol))
-			goto bail1;
-
-	wsi->protocol = &context->protocols[0];
-
-	/*
-	 * Check with each extension if it is able to route and proxy this
-	 * connection for us.  For example, an extension like x-google-mux
-	 * can handle this and then we don't need an actual socket for this
-	 * connection.
-	 */
-	
-	if (lws_ext_callback_for_each_extension_type(context, wsi,
-			LWS_EXT_CALLBACK_CAN_PROXY_CLIENT_CONNECTION,
-						(void *)address, port) > 0) {
-		lwsl_client("libwebsocket_client_connect: ext handling conn\n");
-
-		libwebsocket_set_timeout(wsi,
-			PENDING_TIMEOUT_AWAITING_EXTENSION_CONNECT_RESPONSE,
-							      AWAITING_TIMEOUT);
-
-		wsi->mode = LWS_CONNMODE_WS_CLIENT_WAITING_EXTENSION_CONNECT;
-		return wsi;
-	}
-	lwsl_client("libwebsocket_client_connect: direct conn\n");
-
-       return libwebsocket_client_connect_2(context, wsi);
-
-bail1:
-	free(wsi->u.hdr.ah);
-bail:
-	free(wsi);
-
-	return NULL;
-}
-
-
-/**
- * libwebsocket_client_connect_extended() - Connect to another websocket server
- * @context:	Websocket context
- * @address:	Remote server address, eg, "myserver.com"
- * @port:	Port to connect to on the remote server, eg, 80
- * @ssl_connection:	0 = ws://, 1 = wss:// encrypted, 2 = wss:// allow self
- *			signed certs
- * @path:	Websocket path on server
- * @host:	Hostname on server
- * @origin:	Socket origin name
- * @protocol:	Comma-separated list of protocols being asked for from
- *		the server, or just one.  The server will pick the one it
- *		likes best.
- * @ietf_version_or_minus_one: -1 to ask to connect using the default, latest
- *		protocol supported, or the specific protocol ordinal
- * @userdata: Pre-allocated user data
- *
- *	This function creates a connection to a remote server
- */
-
-LWS_VISIBLE struct libwebsocket *
-libwebsocket_client_connect_extended(struct libwebsocket_context *context,
-			      const char *address,
-			      int port,
-			      int ssl_connection,
-			      const char *path,
-			      const char *host,
-			      const char *origin,
-			      const char *protocol,
-			      int ietf_version_or_minus_one,
-			      void *userdata)
-{
-	struct libwebsocket *ws =
-		libwebsocket_client_connect(context, address, port,
-			ssl_connection, path, host, origin, protocol,
-						     ietf_version_or_minus_one);
-
-	if (ws && !ws->user_space && userdata) {
-		ws->user_space_externally_allocated = 1;
-		ws->user_space = userdata ;
-	}
-
-	return ws ;
-}

dependencies/libwebsockets/lib/client-parser.c

@@ -1,402 +0,0 @@
-/*
- * libwebsockets - small server side websockets and web server implementation
- *
- * Copyright (C) 2010-2014 Andy Green <andy@warmcat.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation:
- *  version 2.1 of the License.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *  MA  02110-1301  USA
- */
-
-#include "private-libwebsockets.h"
-
-int libwebsocket_client_rx_sm(struct libwebsocket *wsi, unsigned char c)
-{
-	int callback_action = LWS_CALLBACK_CLIENT_RECEIVE;
-	int handled;
-	struct lws_tokens eff_buf;
-	int m;
-
-	switch (wsi->lws_rx_parse_state) {
-	case LWS_RXPS_NEW:
-
-		switch (wsi->ietf_spec_revision) {
-
-		case 13:
-			wsi->u.ws.opcode = c & 0xf;
-			wsi->u.ws.rsv = (c & 0x70);
-			wsi->u.ws.final = !!((c >> 7) & 1);
-			switch (wsi->u.ws.opcode) {
-			case LWS_WS_OPCODE_07__TEXT_FRAME:
-			case LWS_WS_OPCODE_07__BINARY_FRAME:
-				wsi->u.ws.frame_is_binary = wsi->u.ws.opcode ==
-						 LWS_WS_OPCODE_07__BINARY_FRAME;
-				break;
-			}
-			wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN;
-			break;
-
-		default:
-			lwsl_err("unknown spec version %02d\n",
-						       wsi->ietf_spec_revision);
-			break;
-		}
-		break;
-
-
-	case LWS_RXPS_04_FRAME_HDR_LEN:
-
-		wsi->u.ws.this_frame_masked = !!(c & 0x80);
-
-		switch (c & 0x7f) {
-		case 126:
-			/* control frames are not allowed to have big lengths */
-			if (wsi->u.ws.opcode & 8)
-				goto illegal_ctl_length;
-			wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN16_2;
-			break;
-		case 127:
-			/* control frames are not allowed to have big lengths */
-			if (wsi->u.ws.opcode & 8)
-				goto illegal_ctl_length;
-			wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_8;
-			break;
-		default:
-			wsi->u.ws.rx_packet_length = c;
-			if (wsi->u.ws.this_frame_masked)
-				wsi->lws_rx_parse_state =
-						LWS_RXPS_07_COLLECT_FRAME_KEY_1;
-			else {
-				if (c)
-					wsi->lws_rx_parse_state =
-					LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED;
-				else {
-					wsi->lws_rx_parse_state = LWS_RXPS_NEW;
-					goto spill;
-				}
-			}
-			break;
-		}
-		break;
-
-	case LWS_RXPS_04_FRAME_HDR_LEN16_2:
-		wsi->u.ws.rx_packet_length = c << 8;
-		wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN16_1;
-		break;
-
-	case LWS_RXPS_04_FRAME_HDR_LEN16_1:
-		wsi->u.ws.rx_packet_length |= c;
-		if (wsi->u.ws.this_frame_masked)
-			wsi->lws_rx_parse_state =
-					LWS_RXPS_07_COLLECT_FRAME_KEY_1;
-		else {
-			if (wsi->u.ws.rx_packet_length)
-				wsi->lws_rx_parse_state =
-					LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED;
-			else {
-				wsi->lws_rx_parse_state = LWS_RXPS_NEW;
-				goto spill;
-			}
-		}
-		break;
-
-	case LWS_RXPS_04_FRAME_HDR_LEN64_8:
-		if (c & 0x80) {
-			lwsl_warn("b63 of length must be zero\n");
-			/* kill the connection */
-			return -1;
-		}
-#if defined __LP64__
-		wsi->u.ws.rx_packet_length = ((size_t)c) << 56;
-#else
-		wsi->u.ws.rx_packet_length = 0;
-#endif
-		wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_7;
-		break;
-
-	case LWS_RXPS_04_FRAME_HDR_LEN64_7:
-#if defined __LP64__
-		wsi->u.ws.rx_packet_length |= ((size_t)c) << 48;
-#endif
-		wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_6;
-		break;
-
-	case LWS_RXPS_04_FRAME_HDR_LEN64_6:
-#if defined __LP64__
-		wsi->u.ws.rx_packet_length |= ((size_t)c) << 40;
-#endif
-		wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_5;
-		break;
-
-	case LWS_RXPS_04_FRAME_HDR_LEN64_5:
-#if defined __LP64__
-		wsi->u.ws.rx_packet_length |= ((size_t)c) << 32;
-#endif
-		wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_4;
-		break;
-
-	case LWS_RXPS_04_FRAME_HDR_LEN64_4:
-		wsi->u.ws.rx_packet_length |= ((size_t)c) << 24;
-		wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_3;
-		break;
-
-	case LWS_RXPS_04_FRAME_HDR_LEN64_3:
-		wsi->u.ws.rx_packet_length |= ((size_t)c) << 16;
-		wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_2;
-		break;
-
-	case LWS_RXPS_04_FRAME_HDR_LEN64_2:
-		wsi->u.ws.rx_packet_length |= ((size_t)c) << 8;
-		wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_1;
-		break;
-
-	case LWS_RXPS_04_FRAME_HDR_LEN64_1:
-		wsi->u.ws.rx_packet_length |= (size_t)c;
-		if (wsi->u.ws.this_frame_masked)
-			wsi->lws_rx_parse_state =
-					LWS_RXPS_07_COLLECT_FRAME_KEY_1;
-		else {
-			if (wsi->u.ws.rx_packet_length)
-				wsi->lws_rx_parse_state =
-					LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED;
-			else {
-				wsi->lws_rx_parse_state = LWS_RXPS_NEW;
-				goto spill;
-			}
-		}
-		break;
-
-	case LWS_RXPS_07_COLLECT_FRAME_KEY_1:
-		wsi->u.ws.frame_masking_nonce_04[0] = c;
-		if (c)
-			wsi->u.ws.all_zero_nonce = 0;
-		wsi->lws_rx_parse_state = LWS_RXPS_07_COLLECT_FRAME_KEY_2;
-		break;
-
-	case LWS_RXPS_07_COLLECT_FRAME_KEY_2:
-		wsi->u.ws.frame_masking_nonce_04[1] = c;
-		if (c)
-			wsi->u.ws.all_zero_nonce = 0;
-		wsi->lws_rx_parse_state = LWS_RXPS_07_COLLECT_FRAME_KEY_3;
-		break;
-
-	case LWS_RXPS_07_COLLECT_FRAME_KEY_3:
-		wsi->u.ws.frame_masking_nonce_04[2] = c;
-		if (c)
-			wsi->u.ws.all_zero_nonce = 0;
-		wsi->lws_rx_parse_state = LWS_RXPS_07_COLLECT_FRAME_KEY_4;
-		break;
-
-	case LWS_RXPS_07_COLLECT_FRAME_KEY_4:
-		wsi->u.ws.frame_masking_nonce_04[3] = c;
-		if (c)
-			wsi->u.ws.all_zero_nonce = 0;
-
-		if (wsi->u.ws.rx_packet_length)
-			wsi->lws_rx_parse_state =
-					LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED;
-		else {
-			wsi->lws_rx_parse_state = LWS_RXPS_NEW;
-			goto spill;
-		}
-		break;
-
-	case LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED:
-
-		if (!wsi->u.ws.rx_user_buffer)
-			lwsl_err("NULL client rx_user_buffer\n");
-
-		if ((!wsi->u.ws.this_frame_masked) || wsi->u.ws.all_zero_nonce)
-			wsi->u.ws.rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING +
-			       (wsi->u.ws.rx_user_buffer_head++)] = c;
-		else
-			wsi->u.ws.rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING +
-			       (wsi->u.ws.rx_user_buffer_head++)] =
-			c ^ wsi->u.ws.frame_masking_nonce_04[
-					    (wsi->u.ws.frame_mask_index++) & 3];
-
-		if (--wsi->u.ws.rx_packet_length == 0) {
-			/* spill because we have the whole frame */
-			wsi->lws_rx_parse_state = LWS_RXPS_NEW;
-			goto spill;
-		}
-
-		/*
-		 * if there's no protocol max frame size given, we are
-		 * supposed to default to LWS_MAX_SOCKET_IO_BUF
-		 */
-
-		if (!wsi->protocol->rx_buffer_size &&
-			 		wsi->u.ws.rx_user_buffer_head !=
-			 				  LWS_MAX_SOCKET_IO_BUF)
-			break;
-		else
-			if (wsi->protocol->rx_buffer_size &&
-					wsi->u.ws.rx_user_buffer_head !=
-						  wsi->protocol->rx_buffer_size)
-			break;
-
-		/* spill because we filled our rx buffer */
-spill:
-
-		handled = 0;
-
-		/*
-		 * is this frame a control packet we should take care of at this
-		 * layer?  If so service it and hide it from the user callback
-		 */
-
-		switch (wsi->u.ws.opcode) {
-		case LWS_WS_OPCODE_07__CLOSE:
-			/* is this an acknowledgement of our close? */
-			if (wsi->state == WSI_STATE_AWAITING_CLOSE_ACK) {
-				/*
-				 * fine he has told us he is closing too, let's
-				 * finish our close
-				 */
-				lwsl_parser("seen server's close ack\n");
-				return -1;
-			}
-			lwsl_parser("client sees server close len = %d\n",
-						 wsi->u.ws.rx_user_buffer_head);
-			/*
-			 * parrot the close packet payload back
-			 * we do not care about how it went, we are closing
-			 * immediately afterwards
-			 */
-			libwebsocket_write(wsi, (unsigned char *)
-			   &wsi->u.ws.rx_user_buffer[
-				LWS_SEND_BUFFER_PRE_PADDING],
-				wsi->u.ws.rx_user_buffer_head, LWS_WRITE_CLOSE);
-			wsi->state = WSI_STATE_RETURNED_CLOSE_ALREADY;
-			/* close the connection */
-			return -1;
-
-		case LWS_WS_OPCODE_07__PING:
-			lwsl_info("client received ping, doing pong\n");
-			/*
-			 * parrot the ping packet payload back as a pong
-			 * !!! this may block or have partial write or fail
-			 * !!! very unlikely if the ping size is small
-			 */
-			libwebsocket_write(wsi, (unsigned char *)
-			    &wsi->u.ws.rx_user_buffer[
-				LWS_SEND_BUFFER_PRE_PADDING],
-					wsi->u.ws.rx_user_buffer_head,
-								LWS_WRITE_PONG);
-			handled = 1;
-			break;
-
-		case LWS_WS_OPCODE_07__PONG:
-			lwsl_info("client receied pong\n");
-			lwsl_hexdump(&wsi->u.ws.rx_user_buffer[
-				LWS_SEND_BUFFER_PRE_PADDING],
-				    wsi->u.ws.rx_user_buffer_head);
-
-			/* issue it */
-			callback_action = LWS_CALLBACK_CLIENT_RECEIVE_PONG;
-			break;
-
-		case LWS_WS_OPCODE_07__CONTINUATION:
-		case LWS_WS_OPCODE_07__TEXT_FRAME:
-		case LWS_WS_OPCODE_07__BINARY_FRAME:
-			break;
-
-		default:
-
-			lwsl_parser("Reserved opc 0x%2X\n", wsi->u.ws.opcode);
-
-			/*
-			 * It's something special we can't understand here.
-			 * Pass the payload up to the extension's parsing
-			 * state machine.
-			 */
-
-			eff_buf.token = &wsi->u.ws.rx_user_buffer[
-						   LWS_SEND_BUFFER_PRE_PADDING];
-			eff_buf.token_len = wsi->u.ws.rx_user_buffer_head;
-			
-			if (lws_ext_callback_for_each_active(wsi,
-				LWS_EXT_CALLBACK_EXTENDED_PAYLOAD_RX,
-					&eff_buf, 0) <= 0) { /* not handle or fail */
-
-				lwsl_ext("Unhandled ext opc 0x%x\n",
-							      wsi->u.ws.opcode);
-				wsi->u.ws.rx_user_buffer_head = 0;
-
-				return 0;
-			}
-			handled = 1;
-			break;
-		}
-
-		/*
-		 * No it's real payload, pass it up to the user callback.
-		 * It's nicely buffered with the pre-padding taken care of
-		 * so it can be sent straight out again using libwebsocket_write
-		 */
-		if (handled)
-			goto already_done;
-
-		eff_buf.token = &wsi->u.ws.rx_user_buffer[
-						LWS_SEND_BUFFER_PRE_PADDING];
-		eff_buf.token_len = wsi->u.ws.rx_user_buffer_head;
-		
-		if (lws_ext_callback_for_each_active(wsi,
-				LWS_EXT_CALLBACK_PAYLOAD_RX,
-						&eff_buf, 0) < 0) /* fail */
-			return -1;
-
-		if (eff_buf.token_len <= 0 &&
-			    callback_action != LWS_CALLBACK_CLIENT_RECEIVE_PONG)
-			goto already_done;
-
-		eff_buf.token[eff_buf.token_len] = '\0';
-
-		if (!wsi->protocol->callback)
-			goto already_done;
-
-		if (callback_action == LWS_CALLBACK_CLIENT_RECEIVE_PONG)
-			lwsl_info("Client doing pong callback\n");
-
-		m = wsi->protocol->callback(
-			wsi->protocol->owning_server,
-			wsi,
-			(enum libwebsocket_callback_reasons)callback_action,
-			wsi->user_space,
-			eff_buf.token,
-			eff_buf.token_len);
-
-		/* if user code wants to close, let caller know */
-		if (m)
-			return 1;
-
-already_done:
-		wsi->u.ws.rx_user_buffer_head = 0;
-		break;
-	default:
-		lwsl_err("client rx illegal state\n");
-		return 1;
-	}
-
-	return 0;
-
-illegal_ctl_length:
-
-	lwsl_warn("Control frame asking for extended length is illegal\n");
-	/* kill the connection */
-	return -1;
-}
-
-

dependencies/libwebsockets/lib/client.c

@@ -1,958 +0,0 @@
-/*
- * libwebsockets - small server side websockets and web server implementation
- *
- * Copyright (C) 2010-2014 Andy Green <andy@warmcat.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation:
- *  version 2.1 of the License.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *  MA  02110-1301  USA
- */
-
-#include "private-libwebsockets.h"
-
-int lws_handshake_client(struct libwebsocket *wsi, unsigned char **buf, size_t len)
-{
-	int n;
-
-	switch (wsi->mode) {
-	case LWS_CONNMODE_WS_CLIENT_WAITING_PROXY_REPLY:
-	case LWS_CONNMODE_WS_CLIENT_ISSUE_HANDSHAKE:
-	case LWS_CONNMODE_WS_CLIENT_WAITING_SERVER_REPLY:
-	case LWS_CONNMODE_WS_CLIENT_WAITING_EXTENSION_CONNECT:
-	case LWS_CONNMODE_WS_CLIENT:
-		for (n = 0; n < len; n++)
-			if (libwebsocket_client_rx_sm(wsi, *(*buf)++)) {
-				lwsl_debug("client_rx_sm failed\n");
-				return 1;
-			}
-		return 0;
-	default:
-		break;
-	}
-	return 0;
-}
-
-int lws_client_socket_service(struct libwebsocket_context *context,
-		struct libwebsocket *wsi, struct libwebsocket_pollfd *pollfd)
-{
-	int n;
-	char *p = (char *)&context->service_buffer[0];
-	int len;
-	unsigned char c;
-
-	switch (wsi->mode) {
-
-	case LWS_CONNMODE_WS_CLIENT_WAITING_CONNECT:
-
-		/*
-		 * we are under PENDING_TIMEOUT_SENT_CLIENT_HANDSHAKE
-		 * timeout protection set in client-handshake.c
-		 */
-
-               if (libwebsocket_client_connect_2(context, wsi) == NULL) {
-			/* closed */
-			lwsl_client("closed\n");
-			return -1;
-		}
-
-		/* either still pending connection, or changed mode */
-		return 0;
-
-	case LWS_CONNMODE_WS_CLIENT_WAITING_PROXY_REPLY:
-
-		/* handle proxy hung up on us */
-
-		if (pollfd->revents & LWS_POLLHUP) {
-
-			lwsl_warn("Proxy connection %p (fd=%d) dead\n",
-				(void *)wsi, pollfd->fd);
-
-			libwebsocket_close_and_free_session(context, wsi,
-						     LWS_CLOSE_STATUS_NOSTATUS);
-			return 0;
-		}
-
-		n = recv(wsi->sock, context->service_buffer,
-					sizeof(context->service_buffer), 0);
-		if (n < 0) {
-			
-			if (LWS_ERRNO == LWS_EAGAIN) {
-				lwsl_debug(
-						   "Proxy read returned EAGAIN... retrying\n");
-				return 0;
-			}
-			
-			libwebsocket_close_and_free_session(context, wsi,
-						     LWS_CLOSE_STATUS_NOSTATUS);
-			lwsl_err("ERROR reading from proxy socket\n");
-			return 0;
-		}
-
-		context->service_buffer[13] = '\0';
-		if (strcmp((char *)context->service_buffer, "HTTP/1.0 200 ")) {
-			libwebsocket_close_and_free_session(context, wsi,
-						     LWS_CLOSE_STATUS_NOSTATUS);
-			lwsl_err("ERROR proxy: %s\n", context->service_buffer);
-			return 0;
-		}
-
-		/* clear his proxy connection timeout */
-
-		libwebsocket_set_timeout(wsi, NO_PENDING_TIMEOUT, 0);
-
-		/* fallthru */
-
-	case LWS_CONNMODE_WS_CLIENT_ISSUE_HANDSHAKE:
-
-		/*
-		 * we are under PENDING_TIMEOUT_SENT_CLIENT_HANDSHAKE
-		 * timeout protection set in client-handshake.c
-		 */
-
-		/*
-		 * take care of our libwebsocket_callback_on_writable
-		 * happening at a time when there's no real connection yet
-		 */
-		if (lws_change_pollfd(wsi, LWS_POLLOUT, 0))
-			return -1;
-
-#ifdef LWS_OPENSSL_SUPPORT
-		/* we can retry this... just cook the SSL BIO the first time */
-
-		if (wsi->use_ssl && !wsi->ssl) {
-#if defined(CYASSL_SNI_HOST_NAME) || defined(SSL_CTRL_SET_TLSEXT_HOSTNAME)
-			const char *hostname = lws_hdr_simple_ptr(wsi,
-						_WSI_TOKEN_CLIENT_PEER_ADDRESS);
-#endif
-
-			wsi->ssl = SSL_new(context->ssl_client_ctx);
-#ifndef USE_CYASSL
-			SSL_set_mode(wsi->ssl,
-					SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
-#endif
-			/*
-			 * use server name indication (SNI), if supported,
-			 * when establishing connection
-			 */
-#ifdef USE_CYASSL
-#ifdef CYASSL_SNI_HOST_NAME
-			CyaSSL_UseSNI(wsi->ssl, CYASSL_SNI_HOST_NAME,
-				hostname, strlen(hostname));
-#endif
-#else
-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
-			SSL_set_tlsext_host_name(wsi->ssl, hostname);
-#endif
-#endif
-
-#ifdef USE_CYASSL
-			/*
-			 * CyaSSL does certificate verification differently
-			 * from OpenSSL.
-			 * If we should ignore the certificate, we need to set
-			 * this before SSL_new and SSL_connect is called.
-			 * Otherwise the connect will simply fail with error
-			 * code -155
-			 */
-			if (wsi->use_ssl == 2)
-				CyaSSL_set_verify(wsi->ssl,
-							SSL_VERIFY_NONE, NULL);
-#endif /* USE_CYASSL */
-
-			wsi->client_bio =
-				BIO_new_socket(wsi->sock, BIO_NOCLOSE);
-			SSL_set_bio(wsi->ssl, wsi->client_bio, wsi->client_bio);
-
-#ifdef USE_CYASSL
-			CyaSSL_set_using_nonblock(wsi->ssl, 1);
-#else
-			BIO_set_nbio(wsi->client_bio, 1); /* nonblocking */
-#endif
-
-			SSL_set_ex_data(wsi->ssl,
-					openssl_websocket_private_data_index,
-								       context);
-		}
-
-		if (wsi->use_ssl) {
-			lws_latency_pre(context, wsi);
-			n = SSL_connect(wsi->ssl);
-			lws_latency(context, wsi,
-			  "SSL_connect LWS_CONNMODE_WS_CLIENT_ISSUE_HANDSHAKE",
-								      n, n > 0);
-
-			if (n < 0) {
-				n = SSL_get_error(wsi->ssl, n);
-
-				if (n == SSL_ERROR_WANT_READ ||
-					n == SSL_ERROR_WANT_WRITE) {
-					/*
-					 * wants us to retry connect due to
-					 * state of the underlying ssl layer...
-					 * but since it may be stalled on
-					 * blocked write, no incoming data may
-					 * arrive to trigger the retry.
-					 * Force (possibly many times if the SSL
-					 * state persists in returning the
-					 * condition code, but other sockets
-					 * are getting serviced inbetweentimes)
-					 * us to get called back when writable.
-					 */
-
-					lwsl_info(
-					     "SSL_connect WANT_... retrying\n");
-					libwebsocket_callback_on_writable(
-								  context, wsi);
-					
-					wsi->mode = LWS_CONNMODE_WS_CLIENT_WAITING_SSL;
-					
-					return 0; /* no error */
-				}
-				n = -1;
-			}
-
-			if (n <= 0) {
-				/*
-				 * retry if new data comes until we
-				 * run into the connection timeout or win
-				 */
-				
-				n = ERR_get_error();
-				if (n != SSL_ERROR_NONE) {
-					lwsl_err("SSL connect error %lu: %s\n",
-						n,
-						ERR_error_string(n,
-							  (char *)context->service_buffer));
-					return 0;
-				}
-			}
-		} else
-			wsi->ssl = NULL;
-
-		/* fallthru */
-			
-	case LWS_CONNMODE_WS_CLIENT_WAITING_SSL:
-			
-		if (wsi->use_ssl) {
-				
-			if (wsi->mode == LWS_CONNMODE_WS_CLIENT_WAITING_SSL) {
-				lws_latency_pre(context, wsi);
-				n = SSL_connect(wsi->ssl);
-				lws_latency(context, wsi,
-							"SSL_connect LWS_CONNMODE_WS_CLIENT_WAITING_SSL",
-							n, n > 0);
-				
-				if (n < 0) {
-					n = SSL_get_error(wsi->ssl, n);
-					
-					if (n == SSL_ERROR_WANT_READ ||
-						n == SSL_ERROR_WANT_WRITE) {
-						/*
-						 * wants us to retry connect due to
-						 * state of the underlying ssl layer...
-						 * but since it may be stalled on
-						 * blocked write, no incoming data may
-						 * arrive to trigger the retry.
-						 * Force (possibly many times if the SSL
-						 * state persists in returning the
-						 * condition code, but other sockets
-						 * are getting serviced inbetweentimes)
-						 * us to get called back when writable.
-						 */
-						
-						lwsl_info(
-								  "SSL_connect WANT_... retrying\n");
-						libwebsocket_callback_on_writable(
-														  context, wsi);
-						
-						wsi->mode = LWS_CONNMODE_WS_CLIENT_WAITING_SSL;
-						
-						return 0; /* no error */
-					}
-					n = -1;
-				}
-				
-				if (n <= 0) {
-					/*
-					 * retry if new data comes until we
-					 * run into the connection timeout or win
-					 */
-					n = ERR_get_error();
-					if (n != SSL_ERROR_NONE) {
-						lwsl_err("SSL connect error %lu: %s\n",
-								 n,
-								 ERR_error_string(n,
-												  (char *)context->service_buffer));
-						return 0;
-					}
-				}
-			}
-			
-			#ifndef USE_CYASSL
-			/*
-			 * See comment above about CyaSSL certificate
-			 * verification
-			 */
-			lws_latency_pre(context, wsi);
-			n = SSL_get_verify_result(wsi->ssl);
-			lws_latency(context, wsi,
-				"SSL_get_verify_result LWS_CONNMODE..HANDSHAKE",
-								      n, n > 0);
-			if ((n != X509_V_OK) && (
-				n != X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT ||
-							   wsi->use_ssl != 2)) {
-
-				lwsl_err(
-				      "server's cert didn't look good %d\n", n);
-				libwebsocket_close_and_free_session(context,
-						wsi, LWS_CLOSE_STATUS_NOSTATUS);
-				return 0;
-			}
-#endif /* USE_CYASSL */
-		} else
-			wsi->ssl = NULL;
-#endif
-		
-		wsi->mode = LWS_CONNMODE_WS_CLIENT_ISSUE_HANDSHAKE2;
-		libwebsocket_set_timeout(wsi,
-				PENDING_TIMEOUT_AWAITING_CLIENT_HS_SEND,
-							      AWAITING_TIMEOUT);
-
-		/* fallthru */
-
-	case LWS_CONNMODE_WS_CLIENT_ISSUE_HANDSHAKE2:
-		p = libwebsockets_generate_client_handshake(context, wsi, p);
-		if (p == NULL) {
-			lwsl_err("Failed to generate handshake for client\n");
-			libwebsocket_close_and_free_session(context, wsi,
-						     LWS_CLOSE_STATUS_NOSTATUS);
-			return 0;
-		}
-
-		/* send our request to the server */
-
-		lws_latency_pre(context, wsi);
-
-		n = lws_ssl_capable_write(wsi, context->service_buffer, p - (char *)context->service_buffer);
-		lws_latency(context, wsi, "send lws_issue_raw", n, n == p - (char *)context->service_buffer);
-		switch (n) {
-		case LWS_SSL_CAPABLE_ERROR:
-			lwsl_debug("ERROR writing to client socket\n");
-			libwebsocket_close_and_free_session(context, wsi,
-						     LWS_CLOSE_STATUS_NOSTATUS);
-			return 0;
-		case LWS_SSL_CAPABLE_MORE_SERVICE:
-			libwebsocket_callback_on_writable(context, wsi);
-			break;
-		}
-
-		wsi->u.hdr.parser_state = WSI_TOKEN_NAME_PART;
-		wsi->u.hdr.lextable_pos = 0;
-		wsi->mode = LWS_CONNMODE_WS_CLIENT_WAITING_SERVER_REPLY;
-		libwebsocket_set_timeout(wsi,
-				PENDING_TIMEOUT_AWAITING_SERVER_RESPONSE,
-							      AWAITING_TIMEOUT);
-		break;
-
-	case LWS_CONNMODE_WS_CLIENT_WAITING_SERVER_REPLY:
-
-		/* handle server hung up on us */
-
-		if (pollfd->revents & LWS_POLLHUP) {
-
-			lwsl_debug("Server connection %p (fd=%d) dead\n",
-				(void *)wsi, pollfd->fd);
-
-			goto bail3;
-		}
-
-		if (!(pollfd->revents & LWS_POLLIN))
-			break;
-
-		/* interpret the server response */
-
-		/*
-		 *  HTTP/1.1 101 Switching Protocols
-		 *  Upgrade: websocket
-		 *  Connection: Upgrade
-		 *  Sec-WebSocket-Accept: me89jWimTRKTWwrS3aRrL53YZSo=
-		 *  Sec-WebSocket-Nonce: AQIDBAUGBwgJCgsMDQ4PEC==
-		 *  Sec-WebSocket-Protocol: chat
-		 */
-
-		/*
-		 * we have to take some care here to only take from the
-		 * socket bytewise.  The browser may (and has been seen to
-		 * in the case that onopen() performs websocket traffic)
-		 * coalesce both handshake response and websocket traffic
-		 * in one packet, since at that point the connection is
-		 * definitively ready from browser pov.
-		 */
-		len = 1;
-		while (wsi->u.hdr.parser_state != WSI_PARSING_COMPLETE &&
-								      len > 0) {
-			n = lws_ssl_capable_read(wsi, &c, 1);
-			lws_latency(context, wsi, "send lws_issue_raw", n, n == 1);
-			switch (n) {
-			case LWS_SSL_CAPABLE_ERROR:
-				goto bail3;
-			case LWS_SSL_CAPABLE_MORE_SERVICE:
-				return 0;
-			}
-
-			if (libwebsocket_parse(context, wsi, c)) {
-				lwsl_warn("problems parsing header\n");
-				goto bail3;
-			}
-		}
-
-		/*
-		 * hs may also be coming in multiple packets, there is a 5-sec
-		 * libwebsocket timeout still active here too, so if parsing did
-		 * not complete just wait for next packet coming in this state
-		 */
-
-		if (wsi->u.hdr.parser_state != WSI_PARSING_COMPLETE)
-			break;
-
-		/*
-		 * otherwise deal with the handshake.  If there's any
-		 * packet traffic already arrived we'll trigger poll() again
-		 * right away and deal with it that way
-		 */
-
-		return lws_client_interpret_server_handshake(context, wsi);
-
-bail3:
-		lwsl_info(
-			"closing connection at LWS_CONNMODE...SERVER_REPLY\n");
-		libwebsocket_close_and_free_session(context, wsi,
-						    LWS_CLOSE_STATUS_NOSTATUS);
-		return -1;
-
-	case LWS_CONNMODE_WS_CLIENT_WAITING_EXTENSION_CONNECT:
-		lwsl_ext("LWS_CONNMODE_WS_CLIENT_WAITING_EXTENSION_CONNECT\n");
-		break;
-
-	case LWS_CONNMODE_WS_CLIENT_PENDING_CANDIDATE_CHILD:
-		lwsl_ext("LWS_CONNMODE_WS_CLIENT_PENDING_CANDIDATE_CHILD\n");
-		break;
-	default:
-		break;
-	}
-
-	return 0;
-}
-
-
-/*
- * In-place str to lower case
- */
-
-static void
-strtolower(char *s)
-{
-	while (*s) {
-		*s = tolower((int)*s);
-		s++;
-	}
-}
-
-int
-lws_client_interpret_server_handshake(struct libwebsocket_context *context,
-		struct libwebsocket *wsi)
-{
-	const char *pc;
-	int okay = 0;
-	char *p;
-	int len;
-#ifndef LWS_NO_EXTENSIONS
-	char ext_name[128];
-	struct libwebsocket_extension *ext;
-	void *v;
-	int more = 1;
-	const char *c;
-#endif
-	int n;
-	int close_reason = LWS_CLOSE_STATUS_PROTOCOL_ERR;
-
-	/*
-	 * well, what the server sent looked reasonable for syntax.
-	 * Now let's confirm it sent all the necessary headers
-	 */
-
-	if (lws_hdr_total_length(wsi, WSI_TOKEN_ACCEPT) == 0) {
-		lwsl_info("no ACCEPT\n");
-		goto bail3;
-	}
-
-	p = lws_hdr_simple_ptr(wsi, WSI_TOKEN_HTTP);
-	if (!p) {
-		lwsl_info("no URI\n");
-		goto bail3;
-	}
-	if (p && strncmp(p, "101", 3)) {
-		lwsl_warn(
-		       "lws_client_handshake: got bad HTTP response '%s'\n", p);
-		goto bail3;
-	}
-
-	p = lws_hdr_simple_ptr(wsi, WSI_TOKEN_UPGRADE);
-	if (!p) {
-		lwsl_info("no UPGRADE\n");
-		goto bail3;
-	}
-	strtolower(p);
-	if (strcmp(p, "websocket")) {
-		lwsl_warn(
-		      "lws_client_handshake: got bad Upgrade header '%s'\n", p);
-		goto bail3;
-	}
-
-	p = lws_hdr_simple_ptr(wsi, WSI_TOKEN_CONNECTION);
-	if (!p) {
-		lwsl_info("no Connection hdr\n");
-		goto bail3;
-	}
-	strtolower(p);
-	if (strcmp(p, "upgrade")) {
-		lwsl_warn("lws_client_int_s_hs: bad header %s\n", p);
-		goto bail3;
-	}
-
-	pc = lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_SENT_PROTOCOLS);
-	if (pc == NULL)
-		lwsl_parser("lws_client_int_s_hs: no protocol list\n");
-	else
-		lwsl_parser("lws_client_int_s_hs: protocol list '%s'\n", pc);
-
-	/*
-	 * confirm the protocol the server wants to talk was in the list
-	 * of protocols we offered
-	 */
-
-	len = lws_hdr_total_length(wsi, WSI_TOKEN_PROTOCOL);
-	if (!len) {
-
-		lwsl_info("lws_client_int_s_hs: WSI_TOKEN_PROTOCOL is null\n");
-		/*
-		 * no protocol name to work from,
-		 * default to first protocol
-		 */
-		wsi->protocol = &context->protocols[0];
-		goto check_extensions;
-	}
-
-	p = lws_hdr_simple_ptr(wsi, WSI_TOKEN_PROTOCOL);
-	len = strlen(p);
-
-	while (*pc && !okay) {
-		if (!strncmp(pc, p, len) &&
-					  (pc[len] == ',' || pc[len] == '\0')) {
-			okay = 1;
-			continue;
-		}
-		while (*pc && *pc != ',')
-			pc++;
-		while (*pc && *pc != ' ')
-			pc++;
-	}
-
-	if (!okay) {
-		lwsl_err("lws_client_int_s_hs: got bad protocol %s\n", p);
-		goto bail2;
-	}
-
-	/*
-	 * identify the selected protocol struct and set it
-	 */
-	n = 0;
-	wsi->protocol = NULL;
-	while (context->protocols[n].callback && !wsi->protocol) {
-		if (strcmp(p, context->protocols[n].name) == 0) {
-			wsi->protocol = &context->protocols[n];
-			break;
-		}
-		n++;
-	}
-
-	if (wsi->protocol == NULL) {
-		lwsl_err("lws_client_int_s_hs: fail protocol %s\n", p);
-		goto bail2;
-	}
-
-
-check_extensions:
-#ifndef LWS_NO_EXTENSIONS
-	/* instantiate the accepted extensions */
-
-	if (!lws_hdr_total_length(wsi, WSI_TOKEN_EXTENSIONS)) {
-		lwsl_ext("no client extenstions allowed by server\n");
-		goto check_accept;
-	}
-
-	/*
-	 * break down the list of server accepted extensions
-	 * and go through matching them or identifying bogons
-	 */
-
-	if (lws_hdr_copy(wsi, (char *)context->service_buffer,
-		   sizeof(context->service_buffer), WSI_TOKEN_EXTENSIONS) < 0) {
-		lwsl_warn("ext list from server failed to copy\n");
-		goto bail2;
-	}
-
-	c = (char *)context->service_buffer;
-	n = 0;
-	while (more) {
-
-		if (*c && (*c != ',' && *c != ' ' && *c != '\t')) {
-			ext_name[n] = *c++;
-			if (n < sizeof(ext_name) - 1)
-				n++;
-			continue;
-		}
-		ext_name[n] = '\0';
-		if (!*c)
-			more = 0;
-		else {
-			c++;
-			if (!n)
-				continue;
-		}
-
-		/* check we actually support it */
-
-		lwsl_ext("checking client ext %s\n", ext_name);
-
-		n = 0;
-		ext = wsi->protocol->owning_server->extensions;
-		while (ext && ext->callback) {
-
-			if (strcmp(ext_name, ext->name)) {
-				ext++;
-				continue;
-			}
-
-			n = 1;
-
-			lwsl_ext("instantiating client ext %s\n", ext_name);
-
-			/* instantiate the extension on this conn */
-
-			wsi->active_extensions_user[
-				wsi->count_active_extensions] =
-					 malloc(ext->per_session_data_size);
-			if (wsi->active_extensions_user[
-				wsi->count_active_extensions] == NULL) {
-				lwsl_err("Out of mem\n");
-				goto bail2;
-			}
-			memset(wsi->active_extensions_user[
-				wsi->count_active_extensions], 0,
-						    ext->per_session_data_size);
-			wsi->active_extensions[
-				  wsi->count_active_extensions] = ext;
-
-			/* allow him to construct his context */
-
-			ext->callback(wsi->protocol->owning_server,
-				ext, wsi,
-				   LWS_EXT_CALLBACK_CLIENT_CONSTRUCT,
-					wsi->active_extensions_user[
-					 wsi->count_active_extensions],
-								   NULL, 0);
-
-			wsi->count_active_extensions++;
-
-			ext++;
-		}
-
-		if (n == 0) {
-			lwsl_warn("Unknown ext '%s'!\n", ext_name);
-			goto bail2;
-		}
-
-		n = 0;
-	}
-
-check_accept:
-#endif
-
-	/*
-	 * Confirm his accept token is the one we precomputed
-	 */
-
-	p = lws_hdr_simple_ptr(wsi, WSI_TOKEN_ACCEPT);
-	if (strcmp(p, wsi->u.hdr.ah->initial_handshake_hash_base64)) {
-		lwsl_warn("lws_client_int_s_hs: accept %s wrong vs %s\n", p,
-				  wsi->u.hdr.ah->initial_handshake_hash_base64);
-		goto bail2;
-	}
-
-	/* allocate the per-connection user memory (if any) */
-	if (libwebsocket_ensure_user_space(wsi)) {
-		lwsl_err("Problem allocating wsi user mem\n");
-		goto bail2;
-	}
-
-	/*
-	 * we seem to be good to go, give client last chance to check
-	 * headers and OK it
-	 */
-
-	wsi->protocol->callback(context, wsi,
-				LWS_CALLBACK_CLIENT_FILTER_PRE_ESTABLISH,
-						     wsi->user_space, NULL, 0);
-
-	/* clear his proxy connection timeout */
-
-	libwebsocket_set_timeout(wsi, NO_PENDING_TIMEOUT, 0);
-
-	/* free up his parsing allocations */
-	if (wsi->u.hdr.ah)
-		free(wsi->u.hdr.ah);
-
-	/* mark him as being alive */
-
-	wsi->state = WSI_STATE_ESTABLISHED;
-	wsi->mode = LWS_CONNMODE_WS_CLIENT;
-
-	/* union transition */
-
-	memset(&wsi->u, 0, sizeof(wsi->u));
-
-	wsi->u.ws.rxflow_change_to = LWS_RXFLOW_ALLOW;
-
-	/*
-	 * create the frame buffer for this connection according to the
-	 * size mentioned in the protocol definition.  If 0 there, then
-	 * use a big default for compatibility
-	 */
-
-	n = wsi->protocol->rx_buffer_size;
-	if (!n)
-		n = LWS_MAX_SOCKET_IO_BUF;
-	n += LWS_SEND_BUFFER_PRE_PADDING + LWS_SEND_BUFFER_POST_PADDING;
-	wsi->u.ws.rx_user_buffer = malloc(n);
-	if (!wsi->u.ws.rx_user_buffer) {
-		lwsl_err("Out of Mem allocating rx buffer %d\n", n);
-		goto bail2;
-	}
-	lwsl_info("Allocating client RX buffer %d\n", n);
-
-	if (setsockopt(wsi->sock, SOL_SOCKET, SO_SNDBUF, (const char *)&n, sizeof n)) {
-		lwsl_warn("Failed to set SNDBUF to %d", n);
-		goto bail3;
-	}
-
-	lwsl_debug("handshake OK for protocol %s\n", wsi->protocol->name);
-
-	/* call him back to inform him he is up */
-
-	wsi->protocol->callback(context, wsi,
-				LWS_CALLBACK_CLIENT_ESTABLISHED,
-						     wsi->user_space, NULL, 0);
-#ifndef LWS_NO_EXTENSIONS
-	/*
-	 * inform all extensions, not just active ones since they
-	 * already know
-	 */
-
-	ext = context->extensions;
-
-	while (ext && ext->callback) {
-		v = NULL;
-		for (n = 0; n < wsi->count_active_extensions; n++)
-			if (wsi->active_extensions[n] == ext)
-				v = wsi->active_extensions_user[n];
-
-		ext->callback(context, ext, wsi,
-			  LWS_EXT_CALLBACK_ANY_WSI_ESTABLISHED, v, NULL, 0);
-		ext++;
-	}
-#endif
-
-	return 0;
-
-bail3:
-	free(wsi->u.ws.rx_user_buffer);
-	wsi->u.ws.rx_user_buffer = NULL;
-	close_reason = LWS_CLOSE_STATUS_NOSTATUS;
-
-bail2:
-	if (wsi->protocol)
-		wsi->protocol->callback(context, wsi,
-			LWS_CALLBACK_CLIENT_CONNECTION_ERROR,
-						      wsi->user_space, NULL, 0);
-
-	lwsl_info("closing connection due to bail2 connection error\n");
-
-	/* free up his parsing allocations */
-
-	if (wsi->u.hdr.ah)
-		free(wsi->u.hdr.ah);
-
-	libwebsocket_close_and_free_session(context, wsi, close_reason);
-
-	return 1;
-}
-
-
-char *
-libwebsockets_generate_client_handshake(struct libwebsocket_context *context,
-		struct libwebsocket *wsi, char *pkt)
-{
-	char buf[128];
-	char hash[20];
-	char key_b64[40];
-	char *p = pkt;
-	int n;
-#ifndef LWS_NO_EXTENSIONS
-	struct libwebsocket_extension *ext;
-	int ext_count = 0;
-#endif
-
-	/*
-	 * create the random key
-	 */
-
-	n = libwebsockets_get_random(context, hash, 16);
-	if (n != 16) {
-		lwsl_err("Unable to read from random dev %s\n",
-						SYSTEM_RANDOM_FILEPATH);
-		libwebsocket_close_and_free_session(context, wsi,
-					     LWS_CLOSE_STATUS_NOSTATUS);
-		return NULL;
-	}
-
-	lws_b64_encode_string(hash, 16, key_b64, sizeof(key_b64));
-
-	/*
-	 * 00 example client handshake
-	 *
-	 * GET /socket.io/websocket HTTP/1.1
-	 * Upgrade: WebSocket
-	 * Connection: Upgrade
-	 * Host: 127.0.0.1:9999
-	 * Origin: http://127.0.0.1
-	 * Sec-WebSocket-Key1: 1 0 2#0W 9 89 7  92 ^
-	 * Sec-WebSocket-Key2: 7 7Y 4328 B2v[8(z1
-	 * Cookie: socketio=websocket
-	 *
-	 * (Á®Ä0¶†≥
-	 *
-	 * 04 example client handshake
-	 *
-	 * GET /chat HTTP/1.1
-	 * Host: server.example.com
-	 * Upgrade: websocket
-	 * Connection: Upgrade
-	 * Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
-	 * Sec-WebSocket-Origin: http://example.com
-	 * Sec-WebSocket-Protocol: chat, superchat
-	 * Sec-WebSocket-Version: 4
-	 */
-
-	p += sprintf(p, "GET %s HTTP/1.1\x0d\x0a",
-				lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_URI));
-
-	p += sprintf(p,
-		"Pragma: no-cache\x0d\x0a""Cache-Control: no-cache\x0d\x0a");
-
-	p += sprintf(p, "Host: %s\x0d\x0a",
-			       lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_HOST));
-	p += sprintf(p,
-"Upgrade: websocket\x0d\x0a""Connection: Upgrade\x0d\x0a""Sec-WebSocket-Key: ");
-	strcpy(p, key_b64);
-	p += strlen(key_b64);
-	p += sprintf(p, "\x0d\x0a");
-	if (lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_ORIGIN))
-		p += sprintf(p, "Origin: http://%s\x0d\x0a",
-			     lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_ORIGIN));
-
-	if (lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_SENT_PROTOCOLS))
-		p += sprintf(p, "Sec-WebSocket-Protocol: %s\x0d\x0a",
-		     lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_SENT_PROTOCOLS));
-
-	/* tell the server what extensions we could support */
-
-	p += sprintf(p, "Sec-WebSocket-Extensions: ");
-#ifndef LWS_NO_EXTENSIONS
-	ext = context->extensions;
-	while (ext && ext->callback) {
-
-		n = lws_ext_callback_for_each_extension_type(context, wsi,
-			   LWS_EXT_CALLBACK_CHECK_OK_TO_PROPOSE_EXTENSION,
-							  (char *)ext->name, 0);
-		if (n) { /* an extension vetos us */
-			lwsl_ext("ext %s vetoed\n", (char *)ext->name);
-			ext++;
-			continue;
-		}
-
-		n = context->protocols[0].callback(context, wsi,
-			LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED,
-				wsi->user_space, (char *)ext->name, 0);
-
-		/*
-		 * zero return from callback means
-		 * go ahead and allow the extension,
-		 * it's what we get if the callback is
-		 * unhandled
-		 */
-
-		if (n) {
-			ext++;
-			continue;
-		}
-
-		/* apply it */
-
-		if (ext_count)
-			*p++ = ',';
-		p += sprintf(p, "%s", ext->name);
-		ext_count++;
-
-		ext++;
-	}
-#endif
-	p += sprintf(p, "\x0d\x0a");
-
-	if (wsi->ietf_spec_revision)
-		p += sprintf(p, "Sec-WebSocket-Version: %d\x0d\x0a",
-					       wsi->ietf_spec_revision);
-
-	/* give userland a chance to append, eg, cookies */
-
-	context->protocols[0].callback(context, wsi,
-		LWS_CALLBACK_CLIENT_APPEND_HANDSHAKE_HEADER,
-		NULL, &p, (pkt + sizeof(context->service_buffer)) - p - 12);
-
-	p += sprintf(p, "\x0d\x0a");
-
-	/* prepare the expected server accept response */
-
-	key_b64[39] = '\0'; /* enforce composed length below buf sizeof */
-	n = sprintf(buf, "%s258EAFA5-E914-47DA-95CA-C5AB0DC85B11", key_b64);
-
-	SHA1((unsigned char *)buf, n, (unsigned char *)hash);
-
-	lws_b64_encode_string(hash, 20,
-			wsi->u.hdr.ah->initial_handshake_hash_base64,
-			  sizeof(wsi->u.hdr.ah->initial_handshake_hash_base64));
-
-	return p;
-}
-

dependencies/libwebsockets/lib/context.c

@@ -1,341 +0,0 @@
-/*
- * libwebsockets - small server side websockets and web server implementation
- *
- * Copyright (C) 2010-2014 Andy Green <andy@warmcat.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation:
- *  version 2.1 of the License.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *  MA  02110-1301  USA
- */
-
-#include "private-libwebsockets.h"
-
-#ifndef LWS_BUILD_HASH
-#define LWS_BUILD_HASH "unknown-build-hash"
-#endif
-
-static const char *library_version = LWS_LIBRARY_VERSION " " LWS_BUILD_HASH;
-
-/**
- * lws_get_library_version: get version and git hash library built from
- *
- *	returns a const char * to a string like "1.1 178d78c"
- *	representing the library version followed by the git head hash it
- *	was built from
- */
-
-LWS_VISIBLE const char *
-lws_get_library_version(void)
-{
-	return library_version;
-}
-
-/**
- * libwebsocket_create_context() - Create the websocket handler
- * @info:	pointer to struct with parameters
- *
- *	This function creates the listening socket (if serving) and takes care
- *	of all initialization in one step.
- *
- *	After initialization, it returns a struct libwebsocket_context * that
- *	represents this server.  After calling, user code needs to take care
- *	of calling libwebsocket_service() with the context pointer to get the
- *	server's sockets serviced.  This must be done in the same process
- *	context as the initialization call.
- *
- *	The protocol callback functions are called for a handful of events
- *	including http requests coming in, websocket connections becoming
- *	established, and data arriving; it's also called periodically to allow
- *	async transmission.
- *
- *	HTTP requests are sent always to the FIRST protocol in @protocol, since
- *	at that time websocket protocol has not been negotiated.  Other
- *	protocols after the first one never see any HTTP callack activity.
- *
- *	The server created is a simple http server by default; part of the
- *	websocket standard is upgrading this http connection to a websocket one.
- *
- *	This allows the same server to provide files like scripts and favicon /
- *	images or whatever over http and dynamic data over websockets all in
- *	one place; they're all handled in the user callback.
- */
-
-LWS_VISIBLE struct libwebsocket_context *
-libwebsocket_create_context(struct lws_context_creation_info *info)
-{
-	struct libwebsocket_context *context = NULL;
-	char *p;
-
-	int pid_daemon = get_daemonize_pid();
-
-	lwsl_notice("Initial logging level %d\n", log_level);
-	lwsl_notice("Library version: %s\n", library_version);
-#ifdef LWS_USE_IPV6
-	if (!(info->options & LWS_SERVER_OPTION_DISABLE_IPV6))
-		lwsl_notice("IPV6 compiled in and enabled\n");
-	else
-		lwsl_notice("IPV6 compiled in but disabled\n");
-#else
-	lwsl_notice("IPV6 not compiled in\n");
-#endif
-	lws_feature_status_libev(info);
-	lwsl_info(" LWS_MAX_HEADER_LEN: %u\n", LWS_MAX_HEADER_LEN);
-	lwsl_info(" LWS_MAX_PROTOCOLS: %u\n", LWS_MAX_PROTOCOLS);
-
-	lwsl_info(" SPEC_LATEST_SUPPORTED: %u\n", SPEC_LATEST_SUPPORTED);
-	lwsl_info(" AWAITING_TIMEOUT: %u\n", AWAITING_TIMEOUT);
-	lwsl_info(" SYSTEM_RANDOM_FILEPATH: '%s'\n", SYSTEM_RANDOM_FILEPATH);
-	lwsl_info(" LWS_MAX_ZLIB_CONN_BUFFER: %u\n", LWS_MAX_ZLIB_CONN_BUFFER);
-
-	if (lws_plat_context_early_init())
-		return NULL;
-
-	context = (struct libwebsocket_context *)
-				malloc(sizeof(struct libwebsocket_context));
-	if (!context) {
-		lwsl_err("No memory for websocket context\n");
-		return NULL;
-	}
-	memset(context, 0, sizeof(*context));
-
-	if (pid_daemon) {
-		context->started_with_parent = pid_daemon;
-		lwsl_notice(" Started with daemon pid %d\n", pid_daemon);
-	}
-
-	context->listen_service_extraseen = 0;
-	context->protocols = info->protocols;
-	context->token_limits = info->token_limits;
-	context->listen_port = info->port;
-	context->http_proxy_port = 0;
-	context->http_proxy_address[0] = '\0';
-	context->options = info->options;
-	context->iface = info->iface;
-	/* to reduce this allocation, */
-	context->max_fds = getdtablesize();
-	lwsl_notice(" static allocation: %u + (%u x %u fds) = %u bytes\n",
-		sizeof(struct libwebsocket_context),
-		sizeof(struct libwebsocket_pollfd) +
-					sizeof(struct libwebsocket *),
-		context->max_fds,
-		sizeof(struct libwebsocket_context) +
-		((sizeof(struct libwebsocket_pollfd) +
-					sizeof(struct libwebsocket *)) *
-							     context->max_fds));
-
-	context->fds = (struct libwebsocket_pollfd *)
-				malloc(sizeof(struct libwebsocket_pollfd) *
-							      context->max_fds);
-	if (context->fds == NULL) {
-		lwsl_err("Unable to allocate fds array for %d connections\n",
-							      context->max_fds);
-		free(context);
-		return NULL;
-	}
-
-	context->lws_lookup = (struct libwebsocket **)
-		      malloc(sizeof(struct libwebsocket *) * context->max_fds);
-	if (context->lws_lookup == NULL) {
-		lwsl_err(
-		  "Unable to allocate lws_lookup array for %d connections\n",
-							      context->max_fds);
-		free(context->fds);
-		free(context);
-		return NULL;
-	}
-	memset(context->lws_lookup, 0, sizeof(struct libwebsocket *) *
-							context->max_fds);
-
-	if (lws_plat_init_fd_tables(context)) {
-		free(context->lws_lookup);
-		free(context->fds);
-		free(context);
-		return NULL;
-	}
-
-	lws_context_init_extensions(info, context);
-
-	context->user_space = info->user;
-
-	strcpy(context->canonical_hostname, "unknown");
-
-	lws_server_get_canonical_hostname(context, info);
-
-	/* split the proxy ads:port if given */
-
-	if (info->http_proxy_address) {
-		strncpy(context->http_proxy_address, info->http_proxy_address,
-				      sizeof(context->http_proxy_address) - 1);
-		context->http_proxy_address[
-				sizeof(context->http_proxy_address) - 1] = '\0';
-		context->http_proxy_port = info->http_proxy_port;
-	} else {
-#ifdef HAVE_GETENV
-		p = getenv("http_proxy");
-		if (p) {
-			strncpy(context->http_proxy_address, p,
-				       sizeof(context->http_proxy_address) - 1);
-			context->http_proxy_address[
-				sizeof(context->http_proxy_address) - 1] = '\0';
-
-			p = strchr(context->http_proxy_address, ':');
-			if (p == NULL) {
-				lwsl_err("http_proxy needs to be ads:port\n");
-				goto bail;
-			}
-			*p = '\0';
-			context->http_proxy_port = atoi(p + 1);
-		}
-#endif
-	}
-
-	if (context->http_proxy_address[0])
-		lwsl_notice(" Proxy %s:%u\n",
-				context->http_proxy_address,
-						      context->http_proxy_port);
-
-	lwsl_notice(
-		" per-conn mem: %u + %u headers + protocol rx buf\n",
-				sizeof(struct libwebsocket),
-					      sizeof(struct allocated_headers));
-		
-	if (lws_context_init_server_ssl(info, context))
-		goto bail;
-	
-	if (lws_context_init_client_ssl(info, context))
-		goto bail;
-
-	if (lws_context_init_server(info, context))
-		goto bail;
-
-	/*
-	 * drop any root privs for this process
-	 * to listen on port < 1023 we would have needed root, but now we are
-	 * listening, we don't want the power for anything else
-	 */
-	lws_plat_drop_app_privileges(info);
-
-	/* initialize supported protocols */
-
-	for (context->count_protocols = 0;
-		info->protocols[context->count_protocols].callback;
-						   context->count_protocols++) {
-
-		lwsl_parser("  Protocol: %s\n",
-				info->protocols[context->count_protocols].name);
-
-		info->protocols[context->count_protocols].owning_server =
-									context;
-		info->protocols[context->count_protocols].protocol_index =
-						       context->count_protocols;
-
-		/*
-		 * inform all the protocols that they are doing their one-time
-		 * initialization if they want to
-		 */
-		info->protocols[context->count_protocols].callback(context,
-			       NULL, LWS_CALLBACK_PROTOCOL_INIT, NULL, NULL, 0);
-	}
-
-	/*
-	 * give all extensions a chance to create any per-context
-	 * allocations they need
-	 */
-
-	if (info->port != CONTEXT_PORT_NO_LISTEN) {
-		if (lws_ext_callback_for_each_extension_type(context, NULL,
-				LWS_EXT_CALLBACK_SERVER_CONTEXT_CONSTRUCT,
-								   NULL, 0) < 0)
-			goto bail;
-	} else
-		if (lws_ext_callback_for_each_extension_type(context, NULL,
-				LWS_EXT_CALLBACK_CLIENT_CONTEXT_CONSTRUCT,
-								   NULL, 0) < 0)
-			goto bail;
-
-	return context;
-
-bail:
-	libwebsocket_context_destroy(context);
-	return NULL;
-}
-
-/**
- * libwebsocket_context_destroy() - Destroy the websocket context
- * @context:	Websocket context
- *
- *	This function closes any active connections and then frees the
- *	context.  After calling this, any further use of the context is
- *	undefined.
- */
-LWS_VISIBLE void
-libwebsocket_context_destroy(struct libwebsocket_context *context)
-{
-	int n;
-	struct libwebsocket_protocols *protocol = context->protocols;
-
-	lwsl_notice("%s\n", __func__);
-
-#ifdef LWS_LATENCY
-	if (context->worst_latency_info[0])
-		lwsl_notice("Worst latency: %s\n", context->worst_latency_info);
-#endif
-
-	for (n = 0; n < context->fds_count; n++) {
-		struct libwebsocket *wsi =
-					context->lws_lookup[context->fds[n].fd];
-		if (!wsi)
-			continue;
-		libwebsocket_close_and_free_session(context,
-			wsi, LWS_CLOSE_STATUS_NOSTATUS /* no protocol close */);
-		n--;
-	}
-
-	/*
-	 * give all extensions a chance to clean up any per-context
-	 * allocations they might have made
-	 */
-	if (context->listen_port) {
-		if (lws_ext_callback_for_each_extension_type(context, NULL,
-			 LWS_EXT_CALLBACK_SERVER_CONTEXT_DESTRUCT, NULL, 0) < 0)
-			return;
-	} else
-		if (lws_ext_callback_for_each_extension_type(context, NULL,
-			 LWS_EXT_CALLBACK_CLIENT_CONTEXT_DESTRUCT, NULL, 0) < 0)
-			return;
-
-	/*
-	 * inform all the protocols that they are done and will have no more
-	 * callbacks
-	 */
-
-	while (protocol->callback) {
-		protocol->callback(context, NULL, LWS_CALLBACK_PROTOCOL_DESTROY,
-				NULL, NULL, 0);
-		protocol++;
-	}
-
-	lws_plat_context_early_destroy(context);
-
-	lws_ssl_context_destroy(context);
-
-	if (context->fds)
-		free(context->fds);
-	if (context->lws_lookup)
-		free(context->lws_lookup);
-
-	lws_plat_context_late_destroy(context);
-
-	free(context);
-}

dependencies/libwebsockets/lib/daemonize.c

@@ -1,222 +0,0 @@
-/*
- * This code is mainly taken from Doug Potter's page
- *
- * http://www-theorie.physik.unizh.ch/~dpotter/howto/daemonize
- *
- * I contacted him 2007-04-16 about the license for the original code,
- * he replied it is Public Domain.  Use the URL above to get the original
- * Public Domain version if you want it.
- *
- * This version is LGPL2 and is (c)2006 - 2013 Andy Green <andy@warmcat.com>
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "private-libwebsockets.h"
-
-int pid_daemon;
-static char *lock_path;
-
-int get_daemonize_pid()
-{
-	return pid_daemon;
-}
-
-static void
-child_handler(int signum)
-{
-	int fd;
-	int len;
-	int sent;
-	char sz[20];
-
-	switch (signum) {
-
-	case SIGALRM: /* timedout daemonizing */
-		exit(1);
-		break;
-
-	case SIGUSR1: /* positive confirmation we daemonized well */
-		/* Create the lock file as the current user */
-
-		fd = open(lock_path, O_TRUNC | O_RDWR | O_CREAT, 0640);
-		if (fd < 0) {
-			fprintf(stderr,
-			   "unable to create lock file %s, code=%d (%s)\n",
-				lock_path, errno, strerror(errno));
-			exit(1);
-		}
-		len = sprintf(sz, "%u", pid_daemon);
-		sent = write(fd, sz, len);
-		if (sent != len)
-			fprintf(stderr,
-			  "unable write pid to lock file %s, code=%d (%s)\n",
-					     lock_path, errno, strerror(errno));
-
-		close(fd);
-		exit(!!(sent == len));
-
-	case SIGCHLD: /* daemonization failed */
-		exit(1);
-		break;
-	}
-}
-
-static void lws_daemon_closing(int sigact)
-{
-	if (getpid() == pid_daemon)
-		if (lock_path) {
-			unlink(lock_path);
-			free(lock_path);
-			lock_path = NULL;
-		}
-
-	kill(getpid(), SIGKILL);
-}
-
-/*
- * You just need to call this from your main(), when it
- * returns you are all set "in the background" decoupled
- * from the console you were started from.
- *
- * The process context you called from has been terminated then.
- */
-
-LWS_VISIBLE int
-lws_daemonize(const char *_lock_path)
-{
-	pid_t sid, parent;
-	int fd;
-	char buf[10];
-	int n, ret;
-	struct sigaction act;
-
-	/* already a daemon */
-	if (getppid() == 1)
-		return 1;
-
-	fd = open(_lock_path, O_RDONLY);
-	if (fd > 0) {
-		n = read(fd, buf, sizeof(buf));
-		close(fd);
-		if (n) {
-			n = atoi(buf);
-			ret = kill(n, 0);
-			if (ret >= 0) {
-				fprintf(stderr,
-				     "Daemon already running from pid %d\n", n);
-				exit(1);
-			}
-			fprintf(stderr,
-			    "Removing stale lock file %s from dead pid %d\n",
-								 _lock_path, n);
-			unlink(lock_path);
-		}
-	}
-
-	n = strlen(_lock_path) + 1;
-	lock_path = malloc(n);
-	if (!lock_path) {
-		fprintf(stderr, "Out of mem in lws_daemonize\n");
-		return 1;
-	}
-	strcpy(lock_path, _lock_path);
-
-	/* Trap signals that we expect to recieve */
-	signal(SIGCHLD, child_handler);	/* died */
-	signal(SIGUSR1, child_handler); /* was happy */
-	signal(SIGALRM, child_handler); /* timeout daemonizing */
-
-	/* Fork off the parent process */
-	pid_daemon = fork();
-	if (pid_daemon < 0) {
-		fprintf(stderr, "unable to fork daemon, code=%d (%s)",
-		    errno, strerror(errno));
-		exit(1);
-	}
-
-	/* If we got a good PID, then we can exit the parent process. */
-	if (pid_daemon > 0) {
-
-		/*
-		 * Wait for confirmation signal from the child via
-		 * SIGCHILD / USR1, or for two seconds to elapse
-		 * (SIGALRM).  pause() should not return.
-		 */
-		alarm(2);
-
-		pause();
-		/* should not be reachable */
-		exit(1);
-	}
-
-	/* At this point we are executing as the child process */
-	parent = getppid();
-	pid_daemon = getpid();
-
-	/* Cancel certain signals */
-	signal(SIGCHLD, SIG_DFL); /* A child process dies */
-	signal(SIGTSTP, SIG_IGN); /* Various TTY signals */
-	signal(SIGTTOU, SIG_IGN);
-	signal(SIGTTIN, SIG_IGN);
-	signal(SIGHUP, SIG_IGN); /* Ignore hangup signal */
-
-	/* Change the file mode mask */
-	umask(0);
-
-	/* Create a new SID for the child process */
-	sid = setsid();
-	if (sid < 0) {
-		fprintf(stderr,
-			"unable to create a new session, code %d (%s)",
-			errno, strerror(errno));
-		exit(1);
-	}
-
-	/*
-	 * Change the current working directory.  This prevents the current
-	 * directory from being locked; hence not being able to remove it.
-	 */
-	if (chdir("/") < 0) {
-		fprintf(stderr,
-			"unable to change directory to %s, code %d (%s)",
-			"/", errno, strerror(errno));
-		exit(1);
-	}
-
-	/* Redirect standard files to /dev/null */
-	if (!freopen("/dev/null", "r", stdin))
-		fprintf(stderr, "unable to freopen() stdin, code %d (%s)",
-						       errno, strerror(errno));
-
-	if (!freopen("/dev/null", "w", stdout))
-		fprintf(stderr, "unable to freopen() stdout, code %d (%s)",
-						       errno, strerror(errno));
-
-	if (!freopen("/dev/null", "w", stderr))
-		fprintf(stderr, "unable to freopen() stderr, code %d (%s)",
-						       errno, strerror(errno));
-
-	/* Tell the parent process that we are A-okay */
-	kill(parent, SIGUSR1);
-
-	act.sa_handler = lws_daemon_closing;
-	sigemptyset(&act.sa_mask);
-	act.sa_flags = 0;
-
-	sigaction(SIGTERM, &act, NULL);
-
-	/* return to continue what is now "the daemon" */
-
-	return 0;
-}
-

dependencies/libwebsockets/lib/extension-deflate-frame.c

@@ -1,294 +0,0 @@
-#include "private-libwebsockets.h"
-#include "extension-deflate-frame.h"
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#define LWS_ZLIB_WINDOW_BITS 15
-#define LWS_ZLIB_MEMLEVEL 8
-
-int lws_extension_callback_deflate_frame(
-		struct libwebsocket_context *context,
-		struct libwebsocket_extension *ext,
-		struct libwebsocket *wsi,
-		enum libwebsocket_extension_callback_reasons reason,
-		void *user, void *in, size_t len)
-{
-	struct lws_ext_deflate_frame_conn *conn =
-				     (struct lws_ext_deflate_frame_conn *)user;
-	struct lws_tokens *eff_buf = (struct lws_tokens *)in;
-	size_t current_payload, remaining_payload, total_payload;
-	int n;
-	size_t len_so_far;
-
-	switch (reason) {
-
-	/*
-	 * for deflate-frame, both client and server sides act the same
-	 */
-
-	case LWS_EXT_CALLBACK_CLIENT_CONSTRUCT:
-	case LWS_EXT_CALLBACK_CONSTRUCT:
-		conn->zs_in.zalloc = conn->zs_out.zalloc = Z_NULL;
-		conn->zs_in.zfree = conn->zs_out.zfree = Z_NULL;
-		conn->zs_in.opaque = conn->zs_out.opaque = Z_NULL;
-		n = inflateInit2(&conn->zs_in, -LWS_ZLIB_WINDOW_BITS);
-		if (n != Z_OK) {
-			lwsl_ext("deflateInit returned %d\n", n);
-			return 1;
-		}
-		n = deflateInit2(&conn->zs_out,
-				 (context->listen_port ?
-					DEFLATE_FRAME_COMPRESSION_LEVEL_SERVER :
-					DEFLATE_FRAME_COMPRESSION_LEVEL_CLIENT),
-				 Z_DEFLATED,
-				 -LWS_ZLIB_WINDOW_BITS, LWS_ZLIB_MEMLEVEL,
-				 Z_DEFAULT_STRATEGY);
-		if (n != Z_OK) {
-			lwsl_ext("deflateInit2 returned %d\n", n);
-			return 1;
-		}
-		conn->buf_pre_used = 0;
-		conn->buf_pre_length = 0;
-		conn->buf_in_length = sizeof(conn->buf_in);
-		conn->buf_out_length = sizeof(conn->buf_out);
-		conn->compressed_out = 0;
-		conn->buf_pre = NULL;
-		conn->buf_in = (unsigned char *)
-				malloc(LWS_SEND_BUFFER_PRE_PADDING +
-					       conn->buf_in_length +
-					       LWS_SEND_BUFFER_POST_PADDING);
-		if (!conn->buf_in)
-			goto bail;
-		conn->buf_out = (unsigned char *)
-				malloc(LWS_SEND_BUFFER_PRE_PADDING +
-						conn->buf_out_length +
-						LWS_SEND_BUFFER_POST_PADDING);
-		if (!conn->buf_out)
-			goto bail;
-		lwsl_ext("zlibs constructed\n");
-		break;
-bail:
-		lwsl_err("Out of mem\n");
-		(void)inflateEnd(&conn->zs_in);
-		(void)deflateEnd(&conn->zs_out);
-		return -1;
-
-	case LWS_EXT_CALLBACK_DESTROY:
-		if (conn->buf_pre)
-			free(conn->buf_pre);
-		free(conn->buf_in);
-		free(conn->buf_out);
-		conn->buf_pre_used = 0;
-		conn->buf_pre_length = 0;
-		conn->buf_in_length = 0;
-		conn->buf_out_length = 0;
-		conn->compressed_out = 0;
-		(void)inflateEnd(&conn->zs_in);
-		(void)deflateEnd(&conn->zs_out);
-		lwsl_ext("zlibs destructed\n");
-		break;
-
-	case LWS_EXT_CALLBACK_PAYLOAD_RX:
-		if (!(wsi->u.ws.rsv & 0x40))
-			return 0;
-
-		/*
-		 * inflate the incoming payload
-		 */
-		current_payload = eff_buf->token_len;
-
-		remaining_payload = wsi->u.ws.rx_packet_length;
-		if (remaining_payload) {
-			total_payload = conn->buf_pre_used +
-					current_payload +
-					remaining_payload;
-
-			if (conn->buf_pre_length < total_payload) {
-				conn->buf_pre_length = total_payload;
-				if (conn->buf_pre)
-					free(conn->buf_pre);
-				conn->buf_pre =
-				    (unsigned char *)malloc(total_payload + 4);
-				if (!conn->buf_pre) {
-					lwsl_err("Out of memory\n");
-					return -1;
-				}
-			}
-
-			memcpy(conn->buf_pre + conn->buf_pre_used,
-					      eff_buf->token, current_payload);
-			conn->buf_pre_used += current_payload;
-
-			eff_buf->token = NULL;
-			eff_buf->token_len = 0;
-
-			return 0;
-		}
-		if (conn->buf_pre_used) {
-			total_payload = conn->buf_pre_used +
-					current_payload;
-
-			memcpy(conn->buf_pre + conn->buf_pre_used,
-					      eff_buf->token, current_payload);
-			conn->buf_pre_used = 0;
-
-			conn->zs_in.next_in = conn->buf_pre;
-		} else {
-			total_payload = current_payload;
-
-			conn->zs_in.next_in = (unsigned char *)eff_buf->token;
-		}
-
-		conn->zs_in.next_in[total_payload + 0] = 0;
-		conn->zs_in.next_in[total_payload + 1] = 0;
-		conn->zs_in.next_in[total_payload + 2] = 0xff;
-		conn->zs_in.next_in[total_payload + 3] = 0xff;
-
-		conn->zs_in.avail_in = total_payload + 4;
-
-		conn->zs_in.next_out =
-				conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING;
-		conn->zs_in.avail_out = conn->buf_in_length;
-
-		while (1) {
-			n = inflate(&conn->zs_in, Z_SYNC_FLUSH);
-			switch (n) {
-			case Z_NEED_DICT:
-			case Z_STREAM_ERROR:
-			case Z_DATA_ERROR:
-			case Z_MEM_ERROR:
-				/*
-				 * screwed.. close the connection...
-				 * we will get a destroy callback to take care
-				 * of closing nicely
-				 */
-				lwsl_info("zlib error inflate %d: %s\n",
-							   n, conn->zs_in.msg);
-				return -1;
-			}
-
-			if (conn->zs_in.avail_out)
-				break;
-
-			len_so_far = conn->zs_in.next_out -
-				(conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING);
-
-			conn->buf_in_length *= 2;
-			if (conn->buf_in_length > LWS_MAX_ZLIB_CONN_BUFFER) {
-				lwsl_ext("zlib in buffer hit limit %u\n",
-						LWS_MAX_ZLIB_CONN_BUFFER);
-				return -1;
-			}
-			conn->buf_in = (unsigned char *)realloc(conn->buf_in,
-					LWS_SEND_BUFFER_PRE_PADDING +
-						conn->buf_in_length +
-						 LWS_SEND_BUFFER_POST_PADDING);
-			if (!conn->buf_in) {
-				lwsl_err("Out of memory\n");
-				return -1;
-			}
-			lwsl_debug(
-				"deflate-frame ext RX did realloc to %ld\n",
-					conn->buf_in_length);
-			conn->zs_in.next_out = conn->buf_in +
-				LWS_SEND_BUFFER_PRE_PADDING + len_so_far;
-			conn->zs_in.avail_out =
-					conn->buf_in_length - len_so_far;
-		}
-
-		/* rewrite the buffer pointers and length */
-		eff_buf->token =
-			(char *)(conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING);
-		eff_buf->token_len = (int)(conn->zs_in.next_out -
-				 (conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING));
-
-		return 0;
-
-	case LWS_EXT_CALLBACK_PAYLOAD_TX:
-		/*
-		 * deflate the outgoing payload
-		 */
-		current_payload = eff_buf->token_len;
-
-		conn->zs_out.next_in = (unsigned char *)eff_buf->token;
-		conn->zs_out.avail_in = current_payload;
-
-		conn->zs_out.next_out =
-				conn->buf_out + LWS_SEND_BUFFER_PRE_PADDING;
-		conn->zs_out.avail_out = conn->buf_out_length;
-
-		while (1) {
-			n = deflate(&conn->zs_out, Z_SYNC_FLUSH);
-			if (n == Z_STREAM_ERROR) {
-				/*
-				 * screwed.. close the connection... we will
-				 * get a destroy callback to take care of
-				 * closing nicely
-				 */
-				lwsl_ext("zlib error deflate\n");
-
-				return -1;
-			}
-
-			if (conn->zs_out.avail_out)
-				break;
-
-			len_so_far = (conn->zs_out.next_out -
-					(conn->buf_out +
-						 LWS_SEND_BUFFER_PRE_PADDING));
-			conn->buf_out_length *= 2;
-			if (conn->buf_out_length > LWS_MAX_ZLIB_CONN_BUFFER) {
-				lwsl_ext("zlib out hit limit %u\n",
-						LWS_MAX_ZLIB_CONN_BUFFER);
-				return -1;
-			}
-			conn->buf_out = (unsigned char *)realloc(
-					conn->buf_out,
-					LWS_SEND_BUFFER_PRE_PADDING +
-						  conn->buf_out_length +
-						  LWS_SEND_BUFFER_POST_PADDING);
-			if (!conn->buf_out) {
-				lwsl_err("Out of memory\n");
-				return -1;
-			}
-			lwsl_debug(
-				"deflate-frame ext TX did realloc to %ld\n",
-					conn->buf_in_length);
-
-			conn->zs_out.next_out = (conn->buf_out +
-				     LWS_SEND_BUFFER_PRE_PADDING + len_so_far);
-			conn->zs_out.avail_out =
-					   (conn->buf_out_length - len_so_far);
-		}
-
-		conn->compressed_out = 1;
-
-		/* rewrite the buffer pointers and length */
-		eff_buf->token = (char *)(conn->buf_out +
-						LWS_SEND_BUFFER_PRE_PADDING);
-		eff_buf->token_len = (int)(conn->zs_out.next_out -
-			    (conn->buf_out + LWS_SEND_BUFFER_PRE_PADDING)) - 4;
-
-		return 0;
-
-	case LWS_EXT_CALLBACK_PACKET_TX_PRESEND:
-		if (conn->compressed_out) {
-			conn->compressed_out = 0;
-			*((unsigned char *)eff_buf->token) |= 0x40;
-		}
-		break;
-
-	case LWS_EXT_CALLBACK_CHECK_OK_TO_PROPOSE_EXTENSION:
-		/* Avoid x-webkit-deflate-frame extension on client */
-		if (!strcmp((char *)in, "x-webkit-deflate-frame"))
-			return 1;
-		break;
-
-	default:
-		break;
-	}
-
-	return 0;
-}
-

dependencies/libwebsockets/lib/extension-deflate-frame.h

@@ -1,25 +0,0 @@
-
-#include <zlib.h>
-
-#define DEFLATE_FRAME_COMPRESSION_LEVEL_SERVER 1
-#define DEFLATE_FRAME_COMPRESSION_LEVEL_CLIENT Z_DEFAULT_COMPRESSION
-
-struct lws_ext_deflate_frame_conn {
-	z_stream zs_in;
-	z_stream zs_out;
-	size_t buf_pre_used;
-	size_t buf_pre_length;
-	size_t buf_in_length;
-	size_t buf_out_length;
-	int compressed_out;
-	unsigned char *buf_pre;
-	unsigned char *buf_in;
-	unsigned char *buf_out;
-};
-
-extern int lws_extension_callback_deflate_frame(
-		struct libwebsocket_context *context,
-		struct libwebsocket_extension *ext,
-		struct libwebsocket *wsi,
-		enum libwebsocket_extension_callback_reasons reason,
-		void *user, void *in, size_t len);

dependencies/libwebsockets/lib/extension-deflate-stream.c

@@ -1,166 +0,0 @@
-#include "private-libwebsockets.h"
-#include "extension-deflate-stream.h"
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#define LWS_ZLIB_WINDOW_BITS 15
-#define LWS_ZLIB_MEMLEVEL 8
-
-int lws_extension_callback_deflate_stream(
-		struct libwebsocket_context *context,
-		struct libwebsocket_extension *ext,
-		struct libwebsocket *wsi,
-			enum libwebsocket_extension_callback_reasons reason,
-					       void *user, void *in, size_t len)
-{
-	struct lws_ext_deflate_stream_conn *conn =
-				     (struct lws_ext_deflate_stream_conn *)user;
-	int n;
-	struct lws_tokens *eff_buf = (struct lws_tokens *)in;
-
-	switch (reason) {
-
-	/*
-	 * for deflate-stream, both client and server sides act the same
-	 */
-
-	case LWS_EXT_CALLBACK_CLIENT_CONSTRUCT:
-	case LWS_EXT_CALLBACK_CONSTRUCT:
-		conn->zs_in.zalloc = conn->zs_out.zalloc = Z_NULL;
-		conn->zs_in.zfree = conn->zs_out.zfree = Z_NULL;
-		conn->zs_in.opaque = conn->zs_out.opaque = Z_NULL;
-		n = inflateInit2(&conn->zs_in, -LWS_ZLIB_WINDOW_BITS);
-		if (n != Z_OK) {
-			lwsl_err("deflateInit returned %d\n", n);
-			return 1;
-		}
-		n = deflateInit2(&conn->zs_out,
-				 DEFLATE_STREAM_COMPRESSION_LEVEL, Z_DEFLATED,
-				 -LWS_ZLIB_WINDOW_BITS, LWS_ZLIB_MEMLEVEL,
-							    Z_DEFAULT_STRATEGY);
-		if (n != Z_OK) {
-			lwsl_err("deflateInit returned %d\n", n);
-			return 1;
-		}
-		lwsl_ext("zlibs constructed\n");
-		conn->remaining_in = 0;
-		break;
-
-	case LWS_EXT_CALLBACK_DESTROY:
-		(void)inflateEnd(&conn->zs_in);
-		(void)deflateEnd(&conn->zs_out);
-		lwsl_ext("zlibs destructed\n");
-		break;
-
-	case LWS_EXT_CALLBACK_PACKET_RX_PREPARSE:
-
-		/*
-		 * inflate the incoming compressed data
-		 * Notice, length may be 0 and pointer NULL
-		 * in the case we are flushing with nothing new coming in
-		 */
-		if (conn->remaining_in) {
-			conn->zs_in.next_in = conn->buf_in;
-			conn->zs_in.avail_in = conn->remaining_in;
-			conn->remaining_in = 0;
-		} else {
-			conn->zs_in.next_in = (unsigned char *)eff_buf->token;
-			conn->zs_in.avail_in = eff_buf->token_len;
-		}
-
-		conn->zs_in.next_out = conn->buf_out;
-		conn->zs_in.avail_out = sizeof(conn->buf_out);
-
-		n = inflate(&conn->zs_in, Z_SYNC_FLUSH);
-		switch (n) {
-		case Z_NEED_DICT:
-		case Z_DATA_ERROR:
-		case Z_MEM_ERROR:
-			/*
-			 * screwed.. close the connection... we will get a
-			 * destroy callback to take care of closing nicely
-			 */
-			lwsl_err("zlib error inflate %d\n", n);
-			return -1;
-		}
-
-		/* rewrite the buffer pointers and length */
-
-		eff_buf->token = (char *)conn->buf_out;
-		eff_buf->token_len =
-			sizeof(conn->buf_out) - conn->zs_in.avail_out;
-
-		/* copy avail data if not consumed */
-		if (conn->zs_in.avail_in > 0) {
-			conn->remaining_in = conn->zs_in.avail_in;
-			memcpy(conn->buf_in, conn->zs_in.next_in,
-							conn->zs_in.avail_in);
-			return 1;
-		}
-
-		/*
-		 * if we filled the output buffer, signal that we likely have
-		 * more and need to be called again
-		 */
-
-		if (eff_buf->token_len == sizeof(conn->buf_out))
-			return 1;
-
-		/* we don't need calling again until new input data comes */
-
-		return 0;
-
-	case LWS_EXT_CALLBACK_FLUSH_PENDING_TX:
-	case LWS_EXT_CALLBACK_PACKET_TX_PRESEND:
-
-		/*
-		 * deflate the outgoing compressed data
-		 */
-
-		conn->zs_out.next_in = (unsigned char *)eff_buf->token;
-		conn->zs_out.avail_in = eff_buf->token_len;
-
-		conn->zs_out.next_out = conn->buf_out;
-		conn->zs_out.avail_out = sizeof(conn->buf_out);
-
-		n = Z_PARTIAL_FLUSH;
-		if (reason == LWS_EXT_CALLBACK_FLUSH_PENDING_TX)
-			n = Z_FULL_FLUSH;
-
-		n = deflate(&conn->zs_out, n);
-		if (n == Z_STREAM_ERROR) {
-			/*
-			 * screwed.. close the connection... we will get a
-			 * destroy callback to take care of closing nicely
-			 */
-			lwsl_ext("zlib error deflate\n");
-
-			return -1;
-		}
-
-		/* rewrite the buffer pointers and length */
-
-		eff_buf->token = (char *)conn->buf_out;
-		eff_buf->token_len =
-				sizeof(conn->buf_out) - conn->zs_out.avail_out;
-
-		/*
-		 * if we filled the output buffer, signal that we likely have
-		 * more and need to be called again... even in deflate case
-		 * we might sometimes need to spill more than came in
-		 */
-
-		if (eff_buf->token_len == sizeof(conn->buf_out))
-			return 1;
-
-		/* we don't need calling again until new input data comes */
-
-		return 0;
-
-	default:
-		break;
-	}
-
-	return 0;
-}

dependencies/libwebsockets/lib/extension-deflate-stream.h

@@ -1,20 +0,0 @@
-
-#include <zlib.h>
-
-#define DEFLATE_STREAM_CHUNK 128
-#define DEFLATE_STREAM_COMPRESSION_LEVEL 1
-
-struct lws_ext_deflate_stream_conn {
-	z_stream zs_in;
-	z_stream zs_out;
-	int remaining_in;
-	unsigned char buf_in[LWS_MAX_SOCKET_IO_BUF];
-	unsigned char buf_out[LWS_MAX_SOCKET_IO_BUF];
-};
-
-extern int lws_extension_callback_deflate_stream(
-		struct libwebsocket_context *context,
-		struct libwebsocket_extension *ext,
-		struct libwebsocket *wsi,
-		enum libwebsocket_extension_callback_reasons reason,
-					      void *user, void *in, size_t len);

dependencies/libwebsockets/lib/extension.c

@@ -1,211 +0,0 @@
-#include "private-libwebsockets.h"
-
-#include "extension-deflate-frame.h"
-#include "extension-deflate-stream.h"
-
-struct libwebsocket_extension libwebsocket_internal_extensions[] = {
-#ifdef LWS_EXT_DEFLATE_STREAM
-	{
-		"deflate-stream",
-		lws_extension_callback_deflate_stream,
-		sizeof(struct lws_ext_deflate_stream_conn)
-	},
-#else
-	{
-		"x-webkit-deflate-frame",
-		lws_extension_callback_deflate_frame,
-		sizeof(struct lws_ext_deflate_frame_conn)
-	},
-	{
-		"deflate-frame",
-		lws_extension_callback_deflate_frame,
-		sizeof(struct lws_ext_deflate_frame_conn)
-	},
-#endif
-	{ /* terminator */
-		NULL, NULL, 0
-	}
-};
-
-LWS_VISIBLE void
-lws_context_init_extensions(struct lws_context_creation_info *info,
-				    struct libwebsocket_context *context)
-{
-	context->extensions = info->extensions;
-	lwsl_info(" LWS_MAX_EXTENSIONS_ACTIVE: %u\n", LWS_MAX_EXTENSIONS_ACTIVE);
-}
-
-LWS_VISIBLE struct libwebsocket_extension *libwebsocket_get_internal_extensions()
-{
-	return libwebsocket_internal_extensions;
-}
-
-
-/* 0 = nobody had nonzero return, 1 = somebody had positive return, -1 = fail */
-
-int lws_ext_callback_for_each_active(struct libwebsocket *wsi, int reason,
-				void *arg, int len)
-{
-	int n, m, handled = 0;
-
-	for (n = 0; n < wsi->count_active_extensions; n++) {
-		m = wsi->active_extensions[n]->callback(
-			wsi->protocol->owning_server,
-			wsi->active_extensions[n], wsi,
-			reason,
-			wsi->active_extensions_user[n],
-			arg, len);
-		if (m < 0) {
-			lwsl_ext(
-			 "Extension '%s' failed to handle callback %d!\n",
-				      wsi->active_extensions[n]->name, reason);
-			return -1;
-		}
-		if (m > handled)
-			handled = m;
-	}
-	
-	return handled;
-}
-
-int lws_ext_callback_for_each_extension_type(
-		struct libwebsocket_context *context, struct libwebsocket *wsi,
-				int reason, void *arg, int len)
-{
-	int n = 0, m, handled = 0;
-	struct libwebsocket_extension *ext = context->extensions;
-
-	while (ext && ext->callback && !handled) {
-		m = ext->callback(context, ext, wsi, reason,
-						(void *)(long)n, arg, len);
-		if (m < 0) {
-			lwsl_ext(
-			 "Extension '%s' failed to handle callback %d!\n",
-				      wsi->active_extensions[n]->name, reason);
-			return -1;
-		}
-		if (m)
-			handled = 1;
-
-		ext++;
-		n++;
-	}
-	
-	return 0;
-}
-
-int
-lws_issue_raw_ext_access(struct libwebsocket *wsi,
-						 unsigned char *buf, size_t len)
-{
-	int ret;
-	struct lws_tokens eff_buf;
-	int m;
-	int n = 0;
-
-	eff_buf.token = (char *)buf;
-	eff_buf.token_len = len;
-
-	/*
-	 * while we have original buf to spill ourselves, or extensions report
-	 * more in their pipeline
-	 */
-
-	ret = 1;
-	while (ret == 1) {
-
-		/* default to nobody has more to spill */
-
-		ret = 0;
-
-		/* show every extension the new incoming data */
-		m = lws_ext_callback_for_each_active(wsi,
-			       LWS_EXT_CALLBACK_PACKET_TX_PRESEND, &eff_buf, 0);
-		if (m < 0)
-			return -1;
-		if (m) /* handled */
-			ret = 1;
-
-		if ((char *)buf != eff_buf.token)
-			/*
-			 * extension recreated it:
-			 * need to buffer this if not all sent
-			 */
-			wsi->u.ws.clean_buffer = 0;
-
-		/* assuming they left us something to send, send it */
-
-		if (eff_buf.token_len) {
-			n = lws_issue_raw(wsi, (unsigned char *)eff_buf.token,
-							    eff_buf.token_len);
-			if (n < 0) {
-				lwsl_info("closing from ext access\n");
-				return -1;
-			}
-
-			/* always either sent it all or privately buffered */
-			if (wsi->u.ws.clean_buffer) {
-				eff_buf.token_len = n;
-				len = n;
-			}
-
-		}
-
-		lwsl_parser("written %d bytes to client\n", n);
-
-		/* no extension has more to spill?  Then we can go */
-
-		if (!ret)
-			break;
-
-		/* we used up what we had */
-
-		eff_buf.token = NULL;
-		eff_buf.token_len = 0;
-
-		/*
-		 * Did that leave the pipe choked?
-		 * Or we had to hold on to some of it?
-		 */
-
-		if (!lws_send_pipe_choked(wsi) && !wsi->truncated_send_len)
-			/* no we could add more, lets's do that */
-			continue;
-
-		lwsl_debug("choked\n");
-
-		/*
-		 * Yes, he's choked.  Don't spill the rest now get a callback
-		 * when he is ready to send and take care of it there
-		 */
-		libwebsocket_callback_on_writable(
-					     wsi->protocol->owning_server, wsi);
-		wsi->extension_data_pending = 1;
-		ret = 0;
-	}
-
-	return len;
-}
-
-int
-lws_any_extension_handled(struct libwebsocket_context *context,
-			  struct libwebsocket *wsi,
-			  enum libwebsocket_extension_callback_reasons r,
-						       void *v, size_t len)
-{
-	int n;
-	int handled = 0;
-
-	/* maybe an extension will take care of it for us */
-
-	for (n = 0; n < wsi->count_active_extensions && !handled; n++) {
-		if (!wsi->active_extensions[n]->callback)
-			continue;
-
-		handled |= wsi->active_extensions[n]->callback(context,
-			wsi->active_extensions[n], wsi,
-			r, wsi->active_extensions_user[n], v, len);
-	}
-
-	return handled;
-}

dependencies/libwebsockets/lib/getifaddrs.c

@@ -1,276 +0,0 @@
-/*
- * downloaded from
- * http://ftp.uninett.no/pub/OpenBSD/src/kerberosV/src/lib/roken/getifaddrs.c
- */
-#if !HAVE_GETIFADDRS
-/*
- * Copyright (c) 2000 - 2001 Kungliga Tekniska H�gskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-
-#ifdef HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>
-#endif
-
-#ifdef HAVE_NETINET_IN6_VAR_H
-#include <netinet/in6_var.h>
-#endif
-
-#ifndef max
-#define max(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
-#include "getifaddrs.h"
-
-static int
-getifaddrs2(struct ifaddrs **ifap,
-	    int af, int siocgifconf, int siocgifflags,
-	    size_t ifreq_sz)
-{
-	int ret;
-	int fd;
-	size_t buf_size;
-	char *buf;
-	struct ifconf ifconf;
-	char *p;
-	size_t sz;
-	struct sockaddr sa_zero;
-	struct ifreq *ifr;
-
-	struct ifaddrs *start,  **end = &start;
-
-	buf = NULL;
-
-	memset(&sa_zero, 0, sizeof(sa_zero));
-	fd = socket(af, SOCK_DGRAM, 0);
-	if (fd < 0)
-		return -1;
-
-	buf_size = 8192;
-	for (;;) {
-		buf = calloc(1, buf_size);
-		if (buf == NULL) {
-			ret = ENOMEM;
-			goto error_out;
-		}
-		ifconf.ifc_len = buf_size;
-		ifconf.ifc_buf = buf;
-
-		/*
-		 * Solaris returns EINVAL when the buffer is too small.
-		 */
-		if (ioctl(fd, siocgifconf, &ifconf) < 0 && errno != EINVAL) {
-			ret = errno;
-			goto error_out;
-		}
-		/*
-		 * Can the difference between a full and a overfull buf
-		 * be determined?
-		 */
-
-		if (ifconf.ifc_len < (int)buf_size)
-			break;
-		free(buf);
-		buf_size *= 2;
-	}
-
-	for (p = ifconf.ifc_buf; p < ifconf.ifc_buf + ifconf.ifc_len; p += sz) {
-		struct ifreq ifreq;
-		struct sockaddr *sa;
-		size_t salen;
-
-		ifr = (struct ifreq *)p;
-		sa  = &ifr->ifr_addr;
-
-		sz = ifreq_sz;
-		salen = sizeof(struct sockaddr);
-#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
-		salen = sa->sa_len;
-		sz = max(sz, sizeof(ifr->ifr_name) + sa->sa_len);
-#endif
-#ifdef SA_LEN
-		salen = SA_LEN(sa);
-		sz = max(sz, sizeof(ifr->ifr_name) + SA_LEN(sa));
-#endif
-		memset(&ifreq, 0, sizeof(ifreq));
-		memcpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifr->ifr_name));
-
-		if (ioctl(fd, siocgifflags, &ifreq) < 0) {
-			ret = errno;
-			goto error_out;
-		}
-
-		*end = malloc(sizeof(**end));
-
-		(*end)->ifa_next = NULL;
-		(*end)->ifa_name = strdup(ifr->ifr_name);
-		(*end)->ifa_flags = ifreq.ifr_flags;
-		(*end)->ifa_addr = malloc(salen);
-		memcpy((*end)->ifa_addr, sa, salen);
-		(*end)->ifa_netmask = NULL;
-
-#if 0
-		/* fix these when we actually need them */
-		if (ifreq.ifr_flags & IFF_BROADCAST) {
-			(*end)->ifa_broadaddr =
-				malloc(sizeof(ifr->ifr_broadaddr));
-			memcpy((*end)->ifa_broadaddr, &ifr->ifr_broadaddr,
-						    sizeof(ifr->ifr_broadaddr));
-		} else if (ifreq.ifr_flags & IFF_POINTOPOINT) {
-			(*end)->ifa_dstaddr = malloc(sizeof(ifr->ifr_dstaddr));
-			memcpy((*end)->ifa_dstaddr, &ifr->ifr_dstaddr,
-						      sizeof(ifr->ifr_dstaddr));
-		} else
-			(*end)->ifa_dstaddr = NULL;
-#else
-		(*end)->ifa_dstaddr = NULL;
-#endif
-		(*end)->ifa_data = NULL;
-
-		end = &(*end)->ifa_next;
-
-	}
-	*ifap = start;
-	close(fd);
-	free(buf);
-	return 0;
-
-error_out:
-	close(fd);
-	free(buf);
-	errno = ret;
-
-	return -1;
-}
-
-int
-getifaddrs(struct ifaddrs **ifap)
-{
-	int ret = -1;
-	errno = ENXIO;
-#if defined(AF_INET6) && defined(SIOCGIF6CONF) && defined(SIOCGIF6FLAGS)
-	if (ret)
-		ret = getifaddrs2(ifap, AF_INET6, SIOCGIF6CONF, SIOCGIF6FLAGS,
-			   sizeof(struct in6_ifreq));
-#endif
-#if defined(HAVE_IPV6) && defined(SIOCGIFCONF)
-	if (ret)
-		ret = getifaddrs2(ifap, AF_INET6, SIOCGIFCONF, SIOCGIFFLAGS,
-			   sizeof(struct ifreq));
-#endif
-#if defined(AF_INET) && defined(SIOCGIFCONF) && defined(SIOCGIFFLAGS)
-	if (ret)
-		ret = getifaddrs2(ifap, AF_INET, SIOCGIFCONF, SIOCGIFFLAGS,
-			   sizeof(struct ifreq));
-#endif
-	return ret;
-}
-
-void
-freeifaddrs(struct ifaddrs *ifp)
-{
-	struct ifaddrs *p, *q;
-
-	for (p = ifp; p; ) {
-		free(p->ifa_name);
-		if (p->ifa_addr)
-			free(p->ifa_addr);
-		if (p->ifa_dstaddr)
-			free(p->ifa_dstaddr);
-		if (p->ifa_netmask)
-			free(p->ifa_netmask);
-		if (p->ifa_data)
-			free(p->ifa_data);
-		q = p;
-		p = p->ifa_next;
-		free(q);
-	}
-}
-
-#ifdef TEST
-
-void
-print_addr(const char *s, struct sockaddr *sa)
-{
-	int i;
-	printf("  %s=%d/", s, sa->sa_family);
-#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
-	for (i = 0;
-	       i < sa->sa_len - ((long)sa->sa_data - (long)&sa->sa_family); i++)
-		printf("%02x", ((unsigned char *)sa->sa_data)[i]);
-#else
-	for (i = 0; i < sizeof(sa->sa_data); i++)
-		printf("%02x", ((unsigned char *)sa->sa_data)[i]);
-#endif
-	printf("\n");
-}
-
-void
-print_ifaddrs(struct ifaddrs *x)
-{
-	struct ifaddrs *p;
-
-	for (p = x; p; p = p->ifa_next) {
-		printf("%s\n", p->ifa_name);
-		printf("  flags=%x\n", p->ifa_flags);
-		if (p->ifa_addr)
-			print_addr("addr", p->ifa_addr);
-		if (p->ifa_dstaddr)
-			print_addr("dstaddr", p->ifa_dstaddr);
-		if (p->ifa_netmask)
-			print_addr("netmask", p->ifa_netmask);
-		printf("  %p\n", p->ifa_data);
-	}
-}
-
-int
-main()
-{
-	struct ifaddrs *a = NULL, *b;
-	getifaddrs2(&a, AF_INET, SIOCGIFCONF,
-				SIOCGIFFLAGS, sizeof(struct ifreq));
-	print_ifaddrs(a);
-	printf("---\n");
-	getifaddrs(&b);
-	print_ifaddrs(b);
-	return 0;
-}
-#endif
-#endif

dependencies/libwebsockets/lib/getifaddrs.h

@@ -1,76 +0,0 @@
-#if HAVE_GETIFADDRS
-#include <sys/types.h>
-#include <ifaddrs.h>
-#else
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Copyright (c) 2000 Kungliga Tekniska H�gskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $KTH: ifaddrs.hin,v 1.3 2000/12/11 00:01:13 assar Exp $ */
-
-#ifndef ifaddrs_h_7467027A95AD4B5C8DDD40FE7D973791
-#define ifaddrs_h_7467027A95AD4B5C8DDD40FE7D973791
-
-/*
- * the interface is defined in terms of the fields below, and this is
- * sometimes #define'd, so there seems to be no simple way of solving
- * this and this seemed the best. */
-
-#undef ifa_dstaddr
-
-struct ifaddrs {
-	struct ifaddrs *ifa_next;
-	char *ifa_name;
-	unsigned int ifa_flags;
-	struct sockaddr *ifa_addr;
-	struct sockaddr *ifa_netmask;
-	struct sockaddr *ifa_dstaddr;
-	void *ifa_data;
-};
-
-#ifndef ifa_broadaddr
-#define ifa_broadaddr ifa_dstaddr
-#endif
-
-int getifaddrs(struct ifaddrs **);
-
-void freeifaddrs(struct ifaddrs *);
-
-#endif /* __ifaddrs_h__ */
-
-#ifdef __cplusplus
-}
-#endif
-#endif