Fix discconect(); build error

.gitignore

@@ -1,47 +1,6 @@
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-# =========================
-# Operating System Files
-# =========================
-
-# OSX
-# =========================
-
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
+bluez-4.101
+wmemulator
+wmmitm
+packedtest
+*.o
+*.so

Makefile

@@ -1,5 +1,19 @@
-all:
-	gcc -g -o wmemulator wmemulator.c wiimote.c input.c wm_crypto.c wm_reports.c wm_print.c -lbluetooth -lSDL -lpthread -lm `pkg-config --cflags dbus-1` -ldbus-1 -Wall
-	gcc -o bdaddr bdaddr.c oui.c -lbluetooth
-	gcc -o sdptool sdptool.c -lbluetooth
+ifeq ($(origin CUSTOM_BUILD),undefined)
+LBLUETOOTH=-lbluetooth
+CFLAGS=
+else
+BLUEZ_DIST=$(shell pwd)/bluez-4.101/dist
+LBLUETOOTH=-L"$(BLUEZ_DIST)/lib" -I"$(BLUEZ_DIST)/include" -Wl,-rpath="$(BLUEZ_DIST)/lib" -lbluetooth
+CFLAGS=-D SDP_SERVER
+endif
+LDBUS=`pkg-config --cflags dbus-1` -ldbus-1
+
+all: wmemulator packedtest wmmitm
+clean:
+	rm -f wmemulator packedtest wmmitm
+wmemulator: wmemulator.c wiimote.c input.c motion.c input_sdl.c input_socket.c wm_crypto.c wm_reports.c wm_print.c sdp.c bdaddr.c adapter.c
+	gcc $(CFLAGS) -o wmemulator wmemulator.c wiimote.c input.c motion.c input_sdl.c input_socket.c wm_crypto.c wm_reports.c wm_print.c sdp.c bdaddr.c adapter.c $(LBLUETOOTH) -lSDL -lpthread -lm $(LDBUS) -Wall
+wmmitm: wmmitm.c wm_print.c sdp.c bdaddr.c adapter.c
+	gcc $(CFLAGS) -o wmmitm wmmitm.c wm_print.c sdp.c bdaddr.c adapter.c $(LBLUETOOTH) -lpthread -lm $(LDBUS) -Wall
+packedtest: packedtest.c
 	gcc -o packedtest packedtest.c

README.md

@@ -4,123 +4,81 @@ Emulates a Bluetooth Wii controller in software.
 
 ![Raspberry Pi 3 running the emulator in Raspbian](rpi_ss.png)
 
-## Why?
+### Features
 
-  - Useful for building portable console mods with internal controllers
-  - Could theoretically be used for extra controllers (WIP)
-  - Can emulate all of the Wiimote's many features and extensions
-  - Allows use of different input devices (keyboard etc.)
-  - For the fun/hell of it
-
-## How?
+- Emulate the Wiimote's many features and extensions
+- Allows use of different input devices (keyboard etc.)
 
 ### Build/Install
 
-The following dependencies/packages are required:
-
-  - libdbus-1-dev
-  - libglib2.0-dev
-  - libsdl1.2-dev
-
-Additionally, bluez-4.101 is required (newer versions currently don't work).
-
-To build the emulator, run the makefile in the source directory. In order to
-connect to the Wii, a plugin must be installed that allows pairing using non
-UTF-8 pin codes. Copy the contents of the bluez-plugin folder to the
-bluez-4.101/plugins folder of the Bluez source and run the makefile in that
-directory. Copy the output wmemu.so file to the Bluez installation's plugins
-directory (e.g. /usr/lib/bluetooth/plugins) and restart the bluetooth service.
+The following dependencies/packages are required (if not already installed):
 
-TODO: Friendlier directions for different distros/targets, prebuilt binaries
+- libdbus-1-dev
+- libglib2.0-dev
+- libsdl1.2-dev
 
-### Step 1: Determine Wiimote Address
+Run the build script (in the project directory):
 
-As of now, it is not possible to emulate an arbitrary Wiimote due to the Wii's
-fussiness when connecting. So you'll need to determine both the Bluetooth
-addresses of a Wii and a Wiimote in order to connect.
+> source ./build-custom.sh
 
-There are lots of ways to find the address of a Wiimote. Below are the steps
-for one method.
-  - use hcitool to search for discoverable devices
+For more information on the build script, see [this explainer](docs/CustomBuild.md).
 
-        > hcitool scan
+### Using the Emulator
 
-  - press the red sync button under the battery cover of the Wiimote
-  - the Wiimote should be listed (Nintendo RVL-CNT-01) with its address
+Stop any running Bluetooth service, e.g.:
 
+> sudo service bluetooth stop
 
-### Step 2: Determine Wii Address
+Start the custom Bluetooth stack (e.g. from the project directory):
 
-Finding a Wii's address is a bit trickier. There are multiple ways to do this
-as well, including using a Bluetooth packet sniffer or using a utility via
-custom firmware on the Wii. Below is a quicker (although messier) way.
+> sudo ./bluez-4.101/dist/sbin/bluetoothd
 
-  - change your Bluetooth address to the Wiimote's (you'll need to do this anyway)
+Run the emulator (in the project directory):
 
-        > sudo ./bdaddr <wiimote address (from part 1)>
+> ./wmemulator
 
-  - reset your adapter to apply the changes
+With no arguments, the emulator will listen for incoming connections (similar to
+syncing a real Wiimote). Pressing the sync button on a Wii should cause it to
+connect.
 
-        > sudo hciconfig hci0 reset
+You can also supply the address of a Wii to directly connect to it as long as
+you have connected to it before (or you change your device's address to the
+address of a trusted Wiimote).
 
-  - run the hcidump utility (you may need to download) (any BT activity monitor
-    can be substituted)
+> ./wmemulator XX:XX:XX:XX:XX:XX
 
-        > hcidump
+You will need to run the custom Bluetooth stack (as described above) whenever
+using the emulator (it won't persist after e.g. a device restart). Also, the
+custom stack generally won't be useful for anything besides Wiimote emulation.
 
-  - press the red sync button on the Wii
-  - press the red sync button on the Wiimote and after the status LEDs on the
-    Wiimote blink 1-5 times, disconnect one of the batteries
-  - if done correctly (with a bit of luck) the Wii will connect to your device,
-    revealing its address
-  - this may take few tries -- note that you must press both sync buttons again
-    each time
+To stop the custom stack and restore the original Bluetooth service, e.g.:
 
-### Step 3: Run the Emulator
+> sudo killall bluetoothd
 
-Once you have determined the address of a Wii and Wiimote, you can run the
-emulator and it will automatically connect to the Wii. As long as the Wiimote
-and the Wii are synced, you will no longer need the physical Wiimote. Though
-due to using its Bluetooth address, you will not be able to connect it to the
-Wii simultaneously with the emulator. Run the following from the WiimoteEmulator
-directory and replace the zeros with your Wii's address.
+> sudo service bluetooth start
 
-    > ./wmemulator 00:00:00:00:00:00
+For more information on bluetooth addresses, see [this explainer](docs/BluetoothAddresses.md).
 
-You will need your Bluetooth address to be the Wiimote's address every time you
-run the emulator. Note that your adapter may reset to the original address when
-you restart your PC, etc.
+### Connecting via UDP sockets
 
-In the event that a mishap or bug in the emulator causes your Wii to block
-you from connecting, you will need to sync the original controller again to
-regain its trust. You will also need to clear the stored link key using
-test-device (included with Bluez).
+To connect via sockets it is expected that you know the Wii consoles address.
 
-    > (somewhere)/bluez-4.101/test/test-device remove <wii address>
+#### UNIX
 
-### Other Tools
+> ./wmemulator XX:XX:XX:XX:XX:XX unix /tmp/some-path-here
 
-**bdaddr**
+#### IP
 
-A redist of the bdaddr utility for Bluez. Might build into some tools, but
-ideally in a future version address spoofing won't be needed anymore.
+> ./wmemulator XX:XX:XX:XX:XX:XX ip {some-port-number-here}
 
-**packedtest**
+#### Data Format
 
-Simple utility for verifying the behavior of packed structs in your
-environment. Might be useful for portability checking.
+Sockets use the format `type status action`. For example, to press and hold the Wiimote + button you would send `button 1 WIIMOTE_PLUS`. To release the + button you would send `button 0 WIIMOTE_PLUS`.
 
-**sdptool**
+**`type`** This can be `analog_motion`, `button`, `hotplug`, or `emulator_control`.
 
-Not useful for anything right now. Part of ongoing work to try to get the Wii
-to sync directly with the emulator. Running this tool creates the Wiimote's
-SDP records, which are vital to the Wii's initial sync process (but not used
-after pairing).
+**`status`** This is the enabled / disabled state of the action. '0' = turn off, '1' = turn on. If you send a 1 the button will stay "pressed" until a 0 is sent.
 
-**wiimitm**
+**`action`** This is the equivalent to the physical control you want to invoke. For example `WIIMOTE_PLUS` or `IR_UP`
 
-Connects to a Wiimote and a Wii at the same time to eavesdrop on their
-communications. All packets sent between the console and controller are
-printed in readable format. Useful for debugging, reverse engineering,
-or entertaining one's curiosity.
-(TODO: Add this to the repo)
+For more information on available types and actions, see [this explainer](docs/SocketActions.md).