From cf889dd8bd983182534457b6778892ef0634e592 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Sun, 25 Mar 2018 23:17:15 +0200
Subject: Rough rtpmidi backend skeleton

---
 backends/rtpmidi.h | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 backends/rtpmidi.h

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
new file mode 100644
index 0000000..f14357f
--- /dev/null
+++ b/backends/rtpmidi.h
@@ -0,0 +1,94 @@
+#include <sys/socket.h>
+#include "midimonster.h"
+
+int init();
+static int rtpmidi_configure(char* option, char* value);
+static int rtpmidi_configure_instance(instance* instance, char* option, char* value);
+static instance* rtpmidi_instance();
+static channel* rtpmidi_channel(instance* instance, char* spec);
+static int rtpmidi_set(instance* inst, size_t num, channel** c, channel_value* v);
+static int rtpmidi_handle(size_t num, managed_fd* fds);
+static int rtpmidi_start();
+static int rtpmidi_shutdown();
+
+#define RTPMIDI_DEFAULT_PORTBASE "9001"
+#define RTPMIDI_RECV_BUF 4096
+
+#define RTPMIDI_COMMAND_LEN
+#define RTPMIDI_COMMAND_DATA_OFFSET
+#define RTPMIDI_HAS_JOURNAL
+#define RTPMIDI_IS_PHANTOM
+
+typedef enum /*_rtpmidi_peer_mode*/ {
+	peer_learned,
+	peer_invited,
+	peer_invited_by,
+	peer_sync,
+	peer_connect
+} rtpmidi_peer_mode;
+
+typedef struct /*_rtpmidi_peer*/ {
+	rtpmidi_peer_mode mode;
+	struct sockaddr_storage dest;
+	socklen_t dest_len;
+	uint32_t ssrc;
+} rtpmidi_peer;
+
+typedef struct /*_rtpmidi_fd*/ {
+	int data;
+	int control;
+} rtpmidi_fd;
+
+typedef struct /*_rtmidi_instance_data*/ {
+	size_t fd_index;
+	size_t npeers;
+	rtpmidi_peer* peers;
+	uint32_t ssrc;
+
+	//apple-midi config
+	char* session_name;
+	char* invite_peers;
+	char* invite_accept;
+
+	//generic mode config
+	uint8_t learn_peers;
+} rtpmidi_instance_data;
+
+#pragma pack(push, 1)
+typedef struct /*_apple_session_command*/ {
+	uint16_t res1;
+	uint8_t command[2];
+	uint32_t version;
+	uint32_t token;
+	uint32_t ssrc;
+	//char* name
+} apple_command;
+
+typedef struct /*_apple_session_sync*/ {
+	uint16_t res1;
+	uint8_t command[2];
+	uint32_t ssrc;
+	uint8_t count;
+	uint8_t res2[3];
+	uint64_t timestamp[3];
+} apple_sync;
+
+typedef struct /*_apple_session_feedback*/ {
+	uint16_t res1;
+	uint8_t command[2];
+	uint32_t ssrc;
+	uint32_t sequence;
+} apple_feedback;
+
+typedef struct /*_rtp_midi_header*/ {
+	uint16_t vpxccmpt; //this is really just an amalgamated constant value
+	uint16_t sequence;
+	uint32_t timestamp;
+	uint32_t ssrc;
+} rtpmidi_header;
+
+typedef struct /*_rtp_midi_command*/ {
+	uint8_t flags;
+	uint8_t additional_length;
+} rtpmidi_command;
+#pragma pack(pop)
-- 
cgit v1.2.3


From 588f204eaa6c69a8f09a70d9188cefcb6c6075f6 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Sun, 8 Dec 2019 02:26:06 +0100
Subject: Partly redesign rtpmidi backend

---
 backends/rtpmidi.h | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index f14357f..6985ede 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -5,7 +5,7 @@ int init();
 static int rtpmidi_configure(char* option, char* value);
 static int rtpmidi_configure_instance(instance* instance, char* option, char* value);
 static instance* rtpmidi_instance();
-static channel* rtpmidi_channel(instance* instance, char* spec);
+static channel* rtpmidi_channel(instance* instance, char* spec, uint8_t flags);
 static int rtpmidi_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int rtpmidi_handle(size_t num, managed_fd* fds);
 static int rtpmidi_start();
@@ -13,11 +13,7 @@ static int rtpmidi_shutdown();
 
 #define RTPMIDI_DEFAULT_PORTBASE "9001"
 #define RTPMIDI_RECV_BUF 4096
-
-#define RTPMIDI_COMMAND_LEN
-#define RTPMIDI_COMMAND_DATA_OFFSET
-#define RTPMIDI_HAS_JOURNAL
-#define RTPMIDI_IS_PHANTOM
+#define RTPMIDI_MDNS_PORT "5353"
 
 typedef enum /*_rtpmidi_peer_mode*/ {
 	peer_learned,
@@ -40,7 +36,7 @@ typedef struct /*_rtpmidi_fd*/ {
 } rtpmidi_fd;
 
 typedef struct /*_rtmidi_instance_data*/ {
-	size_t fd_index;
+	int fd;
 	size_t npeers;
 	rtpmidi_peer* peers;
 	uint32_t ssrc;
-- 
cgit v1.2.3


From 99d31eabf4a3afa4fd54782cc1d7cd92fbdae084 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Sun, 8 Dec 2019 02:27:04 +0100
Subject: Cleanup rtmidi data structures

---
 backends/rtpmidi.h | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index 6985ede..af6a189 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -14,31 +14,27 @@ static int rtpmidi_shutdown();
 #define RTPMIDI_DEFAULT_PORTBASE "9001"
 #define RTPMIDI_RECV_BUF 4096
 #define RTPMIDI_MDNS_PORT "5353"
+#define RTPMIDI_HEADER_MAGIC htobe16(0x80E1)
 
-typedef enum /*_rtpmidi_peer_mode*/ {
-	peer_learned,
-	peer_invited,
-	peer_invited_by,
-	peer_sync,
-	peer_connect
-} rtpmidi_peer_mode;
+typedef enum /*_rtpmidi_instance_mode*/ {
+	direct,
+	apple
+} rtpmidi_instance_mode;
 
 typedef struct /*_rtpmidi_peer*/ {
-	rtpmidi_peer_mode mode;
 	struct sockaddr_storage dest;
 	socklen_t dest_len;
 	uint32_t ssrc;
 } rtpmidi_peer;
 
-typedef struct /*_rtpmidi_fd*/ {
-	int data;
-	int control;
-} rtpmidi_fd;
-
 typedef struct /*_rtmidi_instance_data*/ {
+	rtpmidi_instance_mode mode;
+
 	int fd;
-	size_t npeers;
-	rtpmidi_peer* peers;
+	int control_fd;
+
+	size_t peers;
+	rtpmidi_peer* peer;
 	uint32_t ssrc;
 
 	//apple-midi config
@@ -46,7 +42,7 @@ typedef struct /*_rtmidi_instance_data*/ {
 	char* invite_peers;
 	char* invite_accept;
 
-	//generic mode config
+	//direct mode config
 	uint8_t learn_peers;
 } rtpmidi_instance_data;
 
-- 
cgit v1.2.3


From aa092469e21674bb99275dda08a695f0d426f6de Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Sun, 8 Dec 2019 15:43:05 +0100
Subject: rtpmidi channel spec parsing

---
 backends/rtpmidi.h | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index af6a189..c076fd0 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -16,11 +16,31 @@ static int rtpmidi_shutdown();
 #define RTPMIDI_MDNS_PORT "5353"
 #define RTPMIDI_HEADER_MAGIC htobe16(0x80E1)
 
+enum /*_rtpmidi_channel_type*/ {
+	none = 0,
+	note = 0x90,
+	cc = 0xB0,
+	pressure = 0xA0,
+	aftertouch = 0xD0,
+	pitchbend = 0xE0
+};
+
 typedef enum /*_rtpmidi_instance_mode*/ {
+	unconfigured = 0,
 	direct,
 	apple
 } rtpmidi_instance_mode;
 
+typedef union {
+	struct {
+		uint8_t pad[5];
+		uint8_t type;
+		uint8_t channel;
+		uint8_t control;
+	} fields;
+	uint64_t label;
+} rtpmidi_channel_ident;
+
 typedef struct /*_rtpmidi_peer*/ {
 	struct sockaddr_storage dest;
 	socklen_t dest_len;
-- 
cgit v1.2.3


From 48e12201f5c57cda581bc0c713d99da6524c49a8 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Mon, 9 Dec 2019 23:14:23 +0100
Subject: rtpmidi socket binding

---
 backends/rtpmidi.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index c076fd0..6cab225 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -1,4 +1,6 @@
+#ifndef _WIN32
 #include <sys/socket.h>
+#endif
 #include "midimonster.h"
 
 int init();
-- 
cgit v1.2.3


From 1bde6249ab6b44764ff2d7ef79e2f22ddf9a7082 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Wed, 11 Dec 2019 23:30:46 +0100
Subject: rtpmidi shutdown procedure

---
 backends/rtpmidi.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index 6cab225..78675bc 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -10,10 +10,9 @@ static instance* rtpmidi_instance();
 static channel* rtpmidi_channel(instance* instance, char* spec, uint8_t flags);
 static int rtpmidi_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int rtpmidi_handle(size_t num, managed_fd* fds);
-static int rtpmidi_start();
-static int rtpmidi_shutdown();
+static int rtpmidi_start(size_t n, instance** inst);
+static int rtpmidi_shutdown(size_t n, instance** inst);
 
-#define RTPMIDI_DEFAULT_PORTBASE "9001"
 #define RTPMIDI_RECV_BUF 4096
 #define RTPMIDI_MDNS_PORT "5353"
 #define RTPMIDI_HEADER_MAGIC htobe16(0x80E1)
-- 
cgit v1.2.3


From 60adf2c4fe53e935e6de359ef1c01d0a91ab7480 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Wed, 11 Dec 2019 23:49:11 +0100
Subject: Implement rtpmidi peer handling

---
 backends/rtpmidi.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index 78675bc..ddb7bed 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -3,7 +3,7 @@
 #endif
 #include "midimonster.h"
 
-int init();
+MM_PLUGIN_API int init();
 static int rtpmidi_configure(char* option, char* value);
 static int rtpmidi_configure_instance(instance* instance, char* option, char* value);
 static instance* rtpmidi_instance();
@@ -14,6 +14,7 @@ static int rtpmidi_start(size_t n, instance** inst);
 static int rtpmidi_shutdown(size_t n, instance** inst);
 
 #define RTPMIDI_RECV_BUF 4096
+#define RTPMIDI_DEFAULT_HOST "::"
 #define RTPMIDI_MDNS_PORT "5353"
 #define RTPMIDI_HEADER_MAGIC htobe16(0x80E1)
 
-- 
cgit v1.2.3


From d17023d77e90a8665965da50685dcf4a30f3eb37 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Fri, 13 Dec 2019 22:43:22 +0100
Subject: Basic rtpmidi output

---
 backends/rtpmidi.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index ddb7bed..b56000a 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -13,7 +13,7 @@ static int rtpmidi_handle(size_t num, managed_fd* fds);
 static int rtpmidi_start(size_t n, instance** inst);
 static int rtpmidi_shutdown(size_t n, instance** inst);
 
-#define RTPMIDI_RECV_BUF 4096
+#define RTPMIDI_PACKET_BUFFER 8192
 #define RTPMIDI_DEFAULT_HOST "::"
 #define RTPMIDI_MDNS_PORT "5353"
 #define RTPMIDI_HEADER_MAGIC htobe16(0x80E1)
@@ -58,6 +58,7 @@ typedef struct /*_rtmidi_instance_data*/ {
 	size_t peers;
 	rtpmidi_peer* peer;
 	uint32_t ssrc;
+	uint16_t sequence;
 
 	//apple-midi config
 	char* session_name;
@@ -103,6 +104,6 @@ typedef struct /*_rtp_midi_header*/ {
 
 typedef struct /*_rtp_midi_command*/ {
 	uint8_t flags;
-	uint8_t additional_length;
-} rtpmidi_command;
+	uint8_t length;
+} rtpmidi_command_header;
 #pragma pack(pop)
-- 
cgit v1.2.3


From 81c6af48f9b63171d1f407f8203f742cd64c3688 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Sun, 15 Dec 2019 22:30:06 +0100
Subject: Initial AppleMIDI session support

---
 backends/rtpmidi.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index b56000a..d4ca044 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -16,7 +16,16 @@ static int rtpmidi_shutdown(size_t n, instance** inst);
 #define RTPMIDI_PACKET_BUFFER 8192
 #define RTPMIDI_DEFAULT_HOST "::"
 #define RTPMIDI_MDNS_PORT "5353"
-#define RTPMIDI_HEADER_MAGIC htobe16(0x80E1)
+#define RTPMIDI_HEADER_MAGIC 0x80
+#define RTPMIDI_HEADER_TYPE 0x61
+#define RTPMIDI_GET_TYPE(a) ((a) & 0x7F)
+
+#define APPLEMIDI_INVITE "IN"
+#define APPLEMIDI_ACCEPT "OK"
+#define APPLEMIDI_REJECT "NO"
+#define APPLEMIDI_LEAVE "BY"
+#define APPLEMIDI_SYNC "CK"
+#define APPLEMIDI_FEEDBACK "RS"
 
 enum /*_rtpmidi_channel_type*/ {
 	none = 0,
@@ -96,7 +105,8 @@ typedef struct /*_apple_session_feedback*/ {
 } apple_feedback;
 
 typedef struct /*_rtp_midi_header*/ {
-	uint16_t vpxccmpt; //this is really just an amalgamated constant value
+	uint8_t vpxcc;
+	uint8_t mpt;
 	uint16_t sequence;
 	uint32_t timestamp;
 	uint32_t ssrc;
-- 
cgit v1.2.3


From b5d5f26835ea8840fc3aedd38780f3025d2959b3 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Mon, 16 Dec 2019 22:47:52 +0100
Subject: Move active invitations to global scope

---
 backends/rtpmidi.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index d4ca044..2652db7 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -71,13 +71,18 @@ typedef struct /*_rtmidi_instance_data*/ {
 
 	//apple-midi config
 	char* session_name;
-	char* invite_peers;
-	char* invite_accept;
+	char* accept;
 
 	//direct mode config
 	uint8_t learn_peers;
 } rtpmidi_instance_data;
 
+typedef struct /*rtpmidi_announced_instance*/ {
+	instance* inst;
+	size_t invites;
+	char** invite;
+} rtpmidi_announce;
+
 #pragma pack(push, 1)
 typedef struct /*_apple_session_command*/ {
 	uint16_t res1;
-- 
cgit v1.2.3


From 474077a1ad13f945f2fd3dc6199e67eeeb86f517 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Tue, 24 Dec 2019 00:48:00 +0100
Subject: Implement AppleMIDI responder mode

---
 backends/rtpmidi.h | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index 2652db7..a9effd8 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -19,13 +19,7 @@ static int rtpmidi_shutdown(size_t n, instance** inst);
 #define RTPMIDI_HEADER_MAGIC 0x80
 #define RTPMIDI_HEADER_TYPE 0x61
 #define RTPMIDI_GET_TYPE(a) ((a) & 0x7F)
-
-#define APPLEMIDI_INVITE "IN"
-#define APPLEMIDI_ACCEPT "OK"
-#define APPLEMIDI_REJECT "NO"
-#define APPLEMIDI_LEAVE "BY"
-#define APPLEMIDI_SYNC "CK"
-#define APPLEMIDI_FEEDBACK "RS"
+#define RTPMIDI_DEFAULT_NAME "MIDIMonster"
 
 enum /*_rtpmidi_channel_type*/ {
 	none = 0,
@@ -55,7 +49,8 @@ typedef union {
 typedef struct /*_rtpmidi_peer*/ {
 	struct sockaddr_storage dest;
 	socklen_t dest_len;
-	uint32_t ssrc;
+	//uint32_t ssrc;
+	uint8_t inactive;
 } rtpmidi_peer;
 
 typedef struct /*_rtmidi_instance_data*/ {
@@ -70,8 +65,8 @@ typedef struct /*_rtmidi_instance_data*/ {
 	uint16_t sequence;
 
 	//apple-midi config
-	char* session_name;
-	char* accept;
+	char* session_name; /* initiator only */
+	char* accept; /* participant only */
 
 	//direct mode config
 	uint8_t learn_peers;
@@ -83,10 +78,19 @@ typedef struct /*rtpmidi_announced_instance*/ {
 	char** invite;
 } rtpmidi_announce;
 
+enum applemidi_command {
+	apple_invite = 0x494E, //IN
+	apple_accept = 0x4F4B, //OK
+	apple_reject = 0x4E4F, //NO
+	apple_leave = 0x4259, //BY
+	apple_sync = 0x434B, //CK
+	apple_feedback = 0x5253 //RS
+};
+
 #pragma pack(push, 1)
 typedef struct /*_apple_session_command*/ {
 	uint16_t res1;
-	uint8_t command[2];
+	uint16_t command;
 	uint32_t version;
 	uint32_t token;
 	uint32_t ssrc;
@@ -95,19 +99,19 @@ typedef struct /*_apple_session_command*/ {
 
 typedef struct /*_apple_session_sync*/ {
 	uint16_t res1;
-	uint8_t command[2];
+	uint16_t command;
 	uint32_t ssrc;
 	uint8_t count;
 	uint8_t res2[3];
 	uint64_t timestamp[3];
-} apple_sync;
+} apple_sync_frame;
 
 typedef struct /*_apple_session_feedback*/ {
 	uint16_t res1;
 	uint8_t command[2];
 	uint32_t ssrc;
 	uint32_t sequence;
-} apple_feedback;
+} apple_journal_feedback;
 
 typedef struct /*_rtp_midi_header*/ {
 	uint8_t vpxcc;
-- 
cgit v1.2.3


From 9cb41bd9e07a80885fafe30c9d230615f8b5cc67 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Sat, 28 Dec 2019 14:48:22 +0100
Subject: Extend peer handling

---
 backends/rtpmidi.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index a9effd8..db6237b 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -20,6 +20,7 @@ static int rtpmidi_shutdown(size_t n, instance** inst);
 #define RTPMIDI_HEADER_TYPE 0x61
 #define RTPMIDI_GET_TYPE(a) ((a) & 0x7F)
 #define RTPMIDI_DEFAULT_NAME "MIDIMonster"
+#define RTPMIDI_SERVICE_INTERVAL 1000
 
 enum /*_rtpmidi_channel_type*/ {
 	none = 0,
@@ -50,7 +51,9 @@ typedef struct /*_rtpmidi_peer*/ {
 	struct sockaddr_storage dest;
 	socklen_t dest_len;
 	//uint32_t ssrc;
-	uint8_t inactive;
+	uint8_t active; //marked for reuse
+	uint8_t learned; //learned / configured peer
+	uint8_t connected; //currently in active session
 } rtpmidi_peer;
 
 typedef struct /*_rtmidi_instance_data*/ {
-- 
cgit v1.2.3


From e8d87602618b4a9fab056f1d03b87c706d5f1f9f Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Mon, 23 Mar 2020 01:30:14 +0100
Subject: Update rtpmidi to current API

---
 backends/rtpmidi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index db6237b..a08cf0f 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -6,7 +6,7 @@
 MM_PLUGIN_API int init();
 static int rtpmidi_configure(char* option, char* value);
 static int rtpmidi_configure_instance(instance* instance, char* option, char* value);
-static instance* rtpmidi_instance();
+static int rtpmidi_instance(instance* inst);
 static channel* rtpmidi_channel(instance* instance, char* spec, uint8_t flags);
 static int rtpmidi_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int rtpmidi_handle(size_t num, managed_fd* fds);
-- 
cgit v1.2.3


From bc6b25e14f3ddd8a405a974a4a2e03b9a71d4c9d Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Thu, 2 Apr 2020 23:52:28 +0200
Subject: Implement basic DNS parsing

---
 backends/rtpmidi.h | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index a08cf0f..b1fe26a 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -8,6 +8,7 @@ static int rtpmidi_configure(char* option, char* value);
 static int rtpmidi_configure_instance(instance* instance, char* option, char* value);
 static int rtpmidi_instance(instance* inst);
 static channel* rtpmidi_channel(instance* instance, char* spec, uint8_t flags);
+static uint32_t rtpmidi_interval();
 static int rtpmidi_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int rtpmidi_handle(size_t num, managed_fd* fds);
 static int rtpmidi_start(size_t n, instance** inst);
@@ -22,6 +23,11 @@ static int rtpmidi_shutdown(size_t n, instance** inst);
 #define RTPMIDI_DEFAULT_NAME "MIDIMonster"
 #define RTPMIDI_SERVICE_INTERVAL 1000
 
+#define DNS_POINTER(a) (((a) & 0xC0) == 0xC0)
+#define DNS_LABEL_LENGTH(a) ((a) & 0x3F)
+#define DNS_OPCODE(a) (((a) & 0x78) >> 3)
+#define DNS_RESPONSE(a) ((a) & 0x80)
+
 enum /*_rtpmidi_channel_type*/ {
 	none = 0,
 	note = 0x90,
@@ -90,6 +96,12 @@ enum applemidi_command {
 	apple_feedback = 0x5253 //RS
 };
 
+typedef struct /*_dns_name*/ {
+	size_t alloc;
+	char* name;
+	size_t length;
+} dns_name;
+
 #pragma pack(push, 1)
 typedef struct /*_apple_session_command*/ {
 	uint16_t res1;
@@ -128,4 +140,25 @@ typedef struct /*_rtp_midi_command*/ {
 	uint8_t flags;
 	uint8_t length;
 } rtpmidi_command_header;
+
+typedef struct /*_dns_header*/ {
+	uint16_t id;
+	uint8_t flags[2];
+	uint16_t questions;
+	uint16_t answers;
+	uint16_t servers;
+	uint16_t additional;
+} dns_header;
+
+typedef struct /*_dns_question*/ {
+	uint16_t qtype;
+	uint16_t qclass;
+} dns_question;
+
+typedef struct /*_dns_rr*/ {
+	uint16_t rtype;
+	uint16_t rclass;
+	uint32_t ttl;
+	uint16_t data;
+} dns_rr;
 #pragma pack(pop)
-- 
cgit v1.2.3


From 789b3b31230750b50ad815add0a42a15760e8b83 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Sat, 4 Apr 2020 20:41:04 +0200
Subject: Basic mDNS discovery

---
 backends/rtpmidi.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index b1fe26a..f55b543 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -22,6 +22,8 @@ static int rtpmidi_shutdown(size_t n, instance** inst);
 #define RTPMIDI_GET_TYPE(a) ((a) & 0x7F)
 #define RTPMIDI_DEFAULT_NAME "MIDIMonster"
 #define RTPMIDI_SERVICE_INTERVAL 1000
+#define RTPMIDI_MDNS_DOMAIN "_apple-midi._udp.local"
+#define RTPMIDI_DNSSD_DOMAIN "_services._dns-sd._udp.local"
 
 #define DNS_POINTER(a) (((a) & 0xC0) == 0xC0)
 #define DNS_LABEL_LENGTH(a) ((a) & 0x3F)
@@ -67,6 +69,7 @@ typedef struct /*_rtmidi_instance_data*/ {
 
 	int fd;
 	int control_fd;
+	uint16_t control_port; /*convenience member set by rtpmidi_bind_instance*/
 
 	size_t peers;
 	rtpmidi_peer* peer;
@@ -161,4 +164,10 @@ typedef struct /*_dns_rr*/ {
 	uint32_t ttl;
 	uint16_t data;
 } dns_rr;
+
+typedef struct /*_dns_rr_srv*/ {
+	uint16_t priority;
+	uint16_t weight;
+	uint16_t port;
+} dns_rr_srv;
 #pragma pack(pop)
-- 
cgit v1.2.3


From f28497227eba6783d7e779a5ccaf2a12c1794a94 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Mon, 6 Apr 2020 23:00:48 +0200
Subject: Discover peers, detach from DNS-SD at shutdown

---
 backends/rtpmidi.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index f55b543..f240586 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -22,8 +22,8 @@ static int rtpmidi_shutdown(size_t n, instance** inst);
 #define RTPMIDI_GET_TYPE(a) ((a) & 0x7F)
 #define RTPMIDI_DEFAULT_NAME "MIDIMonster"
 #define RTPMIDI_SERVICE_INTERVAL 1000
-#define RTPMIDI_MDNS_DOMAIN "_apple-midi._udp.local"
-#define RTPMIDI_DNSSD_DOMAIN "_services._dns-sd._udp.local"
+#define RTPMIDI_MDNS_DOMAIN "_apple-midi._udp.local."
+#define RTPMIDI_DNSSD_DOMAIN "_services._dns-sd._udp.local."
 
 #define DNS_POINTER(a) (((a) & 0xC0) == 0xC0)
 #define DNS_LABEL_LENGTH(a) ((a) & 0x3F)
@@ -77,8 +77,8 @@ typedef struct /*_rtmidi_instance_data*/ {
 	uint16_t sequence;
 
 	//apple-midi config
-	char* session_name; /* initiator only */
-	char* accept; /* participant only */
+	char* title;
+	char* accept;
 
 	//direct mode config
 	uint8_t learn_peers;
-- 
cgit v1.2.3


From c52f3d7f48daaaed52277363beb8325e67d67469 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Wed, 8 Apr 2020 22:18:45 +0200
Subject: Restructure mDNS discovery

---
 backends/rtpmidi.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index f240586..631c45a 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -24,6 +24,7 @@ static int rtpmidi_shutdown(size_t n, instance** inst);
 #define RTPMIDI_SERVICE_INTERVAL 1000
 #define RTPMIDI_MDNS_DOMAIN "_apple-midi._udp.local."
 #define RTPMIDI_DNSSD_DOMAIN "_services._dns-sd._udp.local."
+#define RTPMIDI_ANNOUNCE_INTERVAL (60 * 1000)
 
 #define DNS_POINTER(a) (((a) & 0xC0) == 0xC0)
 #define DNS_LABEL_LENGTH(a) ((a) & 0x3F)
@@ -79,6 +80,7 @@ typedef struct /*_rtmidi_instance_data*/ {
 	//apple-midi config
 	char* title;
 	char* accept;
+	uint64_t last_announce;
 
 	//direct mode config
 	uint8_t learn_peers;
-- 
cgit v1.2.3


From b53092ac95fa25d0e6e4e4fc3de9531f43038c4f Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Sat, 11 Apr 2020 18:40:39 +0200
Subject: Use local interface addresses for mDNS announce

---
 backends/rtpmidi.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index 631c45a..9d2c40a 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -92,6 +92,12 @@ typedef struct /*rtpmidi_announced_instance*/ {
 	char** invite;
 } rtpmidi_announce;
 
+typedef struct /*_rtpmidi_addr*/ {
+	int family;
+	//this is actually a fair bit too big, but whatever
+	uint8_t addr[sizeof(struct sockaddr_storage)];
+} rtpmidi_addr;
+
 enum applemidi_command {
 	apple_invite = 0x494E, //IN
 	apple_accept = 0x4F4B, //OK
-- 
cgit v1.2.3


From fe6a11b69fdc3ea7c01f8ffca0c0aa26abe6d9ca Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Mon, 13 Apr 2020 22:41:29 +0200
Subject: Refactor local address query, document libmmbackend calls

---
 backends/rtpmidi.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index 9d2c40a..de610cd 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -86,11 +86,11 @@ typedef struct /*_rtmidi_instance_data*/ {
 	uint8_t learn_peers;
 } rtpmidi_instance_data;
 
-typedef struct /*rtpmidi_announced_instance*/ {
+typedef struct /*rtpmidi_invited_peer*/ {
 	instance* inst;
 	size_t invites;
-	char** invite;
-} rtpmidi_announce;
+	char** name;
+} rtpmidi_invite;
 
 typedef struct /*_rtpmidi_addr*/ {
 	int family;
-- 
cgit v1.2.3


From b34a3f142495da9a2879b6ff13623d9a50dcfb89 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Fri, 17 Apr 2020 23:22:16 +0200
Subject: Extend Windows error reporting, refactor apple command transmission

---
 backends/rtpmidi.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index de610cd..a5d4f4c 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -61,8 +61,9 @@ typedef struct /*_rtpmidi_peer*/ {
 	socklen_t dest_len;
 	//uint32_t ssrc;
 	uint8_t active; //marked for reuse
-	uint8_t learned; //learned / configured peer
+	uint8_t learned; //learned / configured peer (learned peers are marked inactive on session shutdown)
 	uint8_t connected; //currently in active session
+	ssize_t invite; //invite-list index for apple-mode learned peers
 } rtpmidi_peer;
 
 typedef struct /*_rtmidi_instance_data*/ {
@@ -98,14 +99,14 @@ typedef struct /*_rtpmidi_addr*/ {
 	uint8_t addr[sizeof(struct sockaddr_storage)];
 } rtpmidi_addr;
 
-enum applemidi_command {
+typedef enum {
 	apple_invite = 0x494E, //IN
 	apple_accept = 0x4F4B, //OK
 	apple_reject = 0x4E4F, //NO
 	apple_leave = 0x4259, //BY
 	apple_sync = 0x434B, //CK
 	apple_feedback = 0x5253 //RS
-};
+} applemidi_command;
 
 typedef struct /*_dns_name*/ {
 	size_t alloc;
-- 
cgit v1.2.3


From 5ca868f4bf5a48e0d6bd456c02fe834e80dd9fcf Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Sat, 18 Apr 2020 17:34:29 +0200
Subject: Use instance name as mDNS announce name

---
 backends/rtpmidi.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index a5d4f4c..a6b76d9 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -79,7 +79,6 @@ typedef struct /*_rtmidi_instance_data*/ {
 	uint16_t sequence;
 
 	//apple-midi config
-	char* title;
 	char* accept;
 	uint64_t last_announce;
 
-- 
cgit v1.2.3


From 7c1a283c9213dd273d04af72e24b08beb83aec12 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Sun, 19 Apr 2020 15:27:28 +0200
Subject: Connect discovered mDNS peers

---
 backends/rtpmidi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index a6b76d9..9d46911 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -63,7 +63,7 @@ typedef struct /*_rtpmidi_peer*/ {
 	uint8_t active; //marked for reuse
 	uint8_t learned; //learned / configured peer (learned peers are marked inactive on session shutdown)
 	uint8_t connected; //currently in active session
-	ssize_t invite; //invite-list index for apple-mode learned peers
+	ssize_t invite; //invite-list index for apple-mode learned peers (used to track ipv6/ipv4 overlapping invitations)
 } rtpmidi_peer;
 
 typedef struct /*_rtmidi_instance_data*/ {
-- 
cgit v1.2.3


From a8be76f20b3eaa20b53e1cda7686845a08cef32b Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Thu, 23 Apr 2020 23:38:36 +0200
Subject: Split mDNS socket into v4/v6

---
 backends/rtpmidi.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'backends/rtpmidi.h')

diff --git a/backends/rtpmidi.h b/backends/rtpmidi.h
index 9d46911..7e6eccc 100644
--- a/backends/rtpmidi.h
+++ b/backends/rtpmidi.h
@@ -16,6 +16,7 @@ static int rtpmidi_shutdown(size_t n, instance** inst);
 
 #define RTPMIDI_PACKET_BUFFER 8192
 #define RTPMIDI_DEFAULT_HOST "::"
+#define RTPMIDI_DEFAULT4_HOST "0.0.0.0"
 #define RTPMIDI_MDNS_PORT "5353"
 #define RTPMIDI_HEADER_MAGIC 0x80
 #define RTPMIDI_HEADER_TYPE 0x61
-- 
cgit v1.2.3