Implement pairing

Co-Authored-By: Claude <[email protected]>

Author: marcelveldt

Makefile

@@ -34,14 +34,15 @@ vpath %.c $(TOOLS):$(SRC):$(DMAP_PARSER):$(FETCHER)/src
 vpath %.cpp $(TOOLS):$(SRC):$(FETCHER)/src
 
 INCLUDE = -I$(VALGRIND)/memcheck -I$(VALGRIND)/include \
-	  -I$(TOOLS) \
-	  -I$(DMAP_PARSER) \
-	  -I$(MDNS)/include/mdnssvc -I$(MDNS)/include/mdnssd \
-	  -I$(OPENSSL)/include \
-	  -I$(CODECS)/include/addons -I$(CODECS)/include/flac \
-	  -I$(CODECS)/include/shine -I$(CODECS)/include/faac \
-	  -I$(SRC) -I$(SRC)/inc \
-	  -I$(FETCHER)/include
+	-I$(TOOLS) \
+	-I$(DMAP_PARSER) \
+	-I$(MDNS)/include/mdnssvc -I$(MDNS)/include/mdnssd \
+	-I$(OPENSSL)/include \
+	-I$(CODECS)/include/addons -I$(CODECS)/include/flac \
+	-I$(CODECS)/include/shine -I$(CODECS)/include/faac \
+	-I$(SRC) -I$(SRC)/inc \
+	-I$(FETCHER)/include \
+	-Icrosstools/src
 
 CURVE25519_SOURCES = curve25519_dh.c curve25519_mehdi.c curve25519_order.c curve25519_utils.c custom_blind.c\
                      ed25519_sign.c ed25519_verify.c \
@@ -53,11 +54,18 @@ SOURCES = raop_client.c rtsp_client.c \
 	  alac.c \
 	  http_fetcher.c http_error_codes.c
 
-SOURCES_BIN = cross_log.c cross_ssl.c cross_util.c cross_net.c platform.c cliraop.c
+SOURCES_BIN = cross_log.c cross_ssl.c cross_util.c cross_net.c platform.c cliraop.c pairing.cpp bplist.cpp
+ifndef CXX
+	CXX = g++
+endif
+CXXFLAGS ?= -Wall -O2 -std=c++17
 
 OBJECTS = $(patsubst %.c,$(BUILDDIR)/%.o,$(filter %.c,$(SOURCES)))
 OBJECTS += $(patsubst %.cpp,$(BUILDDIR)/%.o,$(filter %.cpp,$(SOURCES)))
 
+OBJECTS_BIN = $(patsubst %.c,$(BUILDDIR)/%.o,$(filter %.c,$(SOURCES_BIN)))
+OBJECTS_BIN += $(patsubst %.cpp,$(BUILDDIR)/%.o,$(filter %.cpp,$(SOURCES_BIN)))
+
 LIBRARY	= $(CODECS)/$(HOST)/$(PLATFORM)/libcodecs.a $(MDNS)/$(HOST)/$(PLATFORM)/libmdns.a
 
 ifneq ($(STATIC),)
@@ -71,8 +79,8 @@ directory:
 	@mkdir -p lib/$(HOST)/$(PLATFORM)
 	@mkdir -p $(BUILDDIR)
 
-$(EXECUTABLE): $(SOURCES_BIN:%.c=$(BUILDDIR)/%.o) $(LIB)
-	$(CC) $^ $(LIBRARY) $(CFLAGS) $(LDFLAGS) -o $@
+$(EXECUTABLE): $(OBJECTS_BIN) $(LIB)
+	$(CXX) $(OBJECTS_BIN) $(LIB) $(LIBRARY) $(LDFLAGS) -o $@
 ifeq ($(HOST),macos)
 	rm -f $(CORE)
 	lipo -create -output $(CORE) $$(ls $(CORE)* | grep -v '\-static')

src/cliraop.c

@@ -13,7 +13,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
-#include "platform.h"
+#include "../crosstools/src/platform.h"
 #include <assert.h>
 
 #include <sys/stat.h>
@@ -32,13 +32,14 @@
 #endif
 #endif
 
-#include "cross_thread.h"
+#include "../crosstools/src/cross_thread.h"
 #include "raop_client.h"
-#include "cross_net.h"
-#include "cross_ssl.h"
+#include "../crosstools/src/cross_net.h"
+#include "../crosstools/src/cross_ssl.h"
 #include "cross_util.h"
 #include "cross_log.h"
 #include "http_fetcher.h"
+#include "pairing.h"
 
 #define RAOP_SEC(ntp) ((uint32_t)((ntp) >> 32))
 #define RAOP_FRAC(ntp) ((uint32_t)(ntp))
@@ -123,6 +124,7 @@ static int print_usage(char *argv[])
 
 		   "\t[-if <ipaddress>] (IP of the interface to bind to)\n"
 
+		   "\t[-pair] enter pairing mode for AppleTV\n"
 		   "\t[-debug <debug level>] (0 = silent)\n",
 		   name);
 	return -1;
@@ -324,28 +326,34 @@ int main(int argc, char *argv[])
 	int i, n = -1, level = 3;
 	raop_crypto_t crypto = RAOP_CLEAR;
 	uint64_t start = 0, start_at = 0, last = 0, frames = 0;
-	bool alac = false, encryption = false, auth = false;
+	bool alac = false, encryption = false, auth = false, pairing_mode = false;
 	char *passwd = "", *secret = "", *md = "0,1,2", *et = "0,4", *am = "", *pk = "", *pw = "";
 	char *iface = NULL;
 	uint32_t glNetmask;
 	char glInterface[16] = "?";
 	static struct in_addr glHost;
+	char *pair_udn = NULL;
+	char *pair_secret = NULL;
 
 	// parse arguments
 	for (i = 1; i < argc; i++)
 	{
-		if (!strcmp(argv[i], "-ntp"))
+		if (!strcmp(argv[i], "-pair"))
+		{
+			pairing_mode = true;
+		}
+		else if (!strcmp(argv[i], "-ntp"))
 		{
 			uint64_t t = raopcl_get_ntp(NULL);
 			printf("%" PRIu64 "\n", t);
 			exit(0);
 		}
-		if (!strcmp(argv[i], "-check"))
+		else if (!strcmp(argv[i], "-check"))
 		{
 			printf("cliraop check\n");
 			exit(0);
 		}
-		if (!strcmp(argv[i], "-port"))
+		else if (!strcmp(argv[i], "-port"))
 		{
 			player.port = atoi(argv[++i]);
 		}
@@ -447,6 +455,23 @@ int main(int argc, char *argv[])
 	LOG_INFO("Binding to %s [%s] with mask 0x%08x", inet_ntoa(glHost), iface, ntohl(glNetmask));
 	NFREE(iface);
 
+	if (pairing_mode)
+	{
+		// Initialize platform/SSL for pairing
+		netsock_init();
+		cross_ssl_load();
+
+		if (AppleTVpairing(NULL, &pair_udn, &pair_secret))
+		{
+			printf("\nPairing successful!\nUDN: %s\nSecret: %s\n", pair_udn ? pair_udn : "(none)", pair_secret ? pair_secret : "(none)");
+		}
+		else
+		{
+			printf("Pairing failed.\n");
+		}
+		exit(0);
+	}
+
 	if (!player.hostname)
 		return print_usage(argv);
 	if (!fname)

src/pairing.cpp

@@ -165,6 +165,8 @@ std::vector<uint8_t> computeM1(std::vector<uint8_t> pk, std::vector<uint8_t> sal
 	return M1;
 }
 
+extern "C" {
+
 bool AppleTVpairing(struct mdnssd_handle_s* mDNShandle, char **pUDN, char **pSecret) {
 	char response[32] = { };
 	AppleTV *player = NULL;
@@ -226,7 +228,7 @@ bool AppleTVpairing(struct mdnssd_handle_s* mDNShandle, char **pUDN, char **pSec
 
 	kd_add(headers, "Connection", "keep-alive");
 	kd_add(headers, "Content-Type", "application/octet-stream");
-	
+
 	char *buffer = http_send(sock, "POST /pair-pin-start HTTP/1.1", headers);
 	//printf("%s", buffer);
 	NFREE(buffer);
@@ -412,3 +414,5 @@ bool AppleTVpairing(struct mdnssd_handle_s* mDNShandle, char **pUDN, char **pSec
 	if (!mDNShandle) mdnssd_close(mDNS);
 	return true;
 }
+
+} // extern "C"

src/pairing.h

@@ -0,0 +1,10 @@
+// pairing.h
+#pragma once
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+    bool AppleTVpairing(struct mdnssd_handle_s *mDNShandle, char **pUDN, char **pSecret);
+#ifdef __cplusplus
+}
+#endif