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.c | 44 ++++++++++++++++++++++++++++++++------------
backends/rtpmidi.h | 5 ++---
2 files changed, 34 insertions(+), 15 deletions(-)
(limited to 'backends')
diff --git a/backends/rtpmidi.c b/backends/rtpmidi.c
index 38cc9c1..77819ee 100644
--- a/backends/rtpmidi.c
+++ b/backends/rtpmidi.c
@@ -323,10 +323,9 @@ static int rtpmidi_handle(size_t num, managed_fd* fds){
return 1;
}
-static int rtpmidi_start(){
- size_t n, u, fds = 0;
+static int rtpmidi_start(size_t n, instance** inst){
+ size_t u, fds = 0;
int rv = 1;
- instance** inst = NULL;
rtpmidi_instance_data* data = NULL;
//if mdns name defined and no socket, bind default values
@@ -349,12 +348,6 @@ static int rtpmidi_start(){
fprintf(stderr, "No mDNS discovery interface bound, AppleMIDI session discovery disabled\n");
}
- //fetch all defined instances
- if(mm_backend_instances(BACKEND_NAME, &n, &inst)){
- fprintf(stderr, "Failed to fetch instance list\n");
- return 1;
- }
-
for(u = 0; u < n; u++){
data = (rtpmidi_instance_data*) inst[u]->impl;
//check whether instances are explicitly configured to a mode
@@ -385,12 +378,39 @@ static int rtpmidi_start(){
fprintf(stderr, "rtpmidi backend registered %" PRIsize_t " descriptors to core\n", fds);
rv = 0;
bail:
- free(inst);
return rv;
}
-static int rtpmidi_shutdown(){
- //TODO cleanup instance data
+static int rtpmidi_shutdown(size_t n, instance** inst){
+ rtpmidi_instance_data* data = NULL;
+ size_t u;
+
+ for(u = 0; u < n; u++){
+ data = (rtpmidi_instance_data*) inst[u]->impl;
+ if(data->fd >= 0){
+ close(data->fd);
+ }
+
+ if(data->control_fd >= 0){
+ close(data->control_fd);
+ }
+
+ free(data->session_name);
+ data->session_name = NULL;
+
+ free(data->invite_peers);
+ data->invite_peers = NULL;
+
+ free(data->invite_accept);
+ data->invite_accept = NULL;
+
+ free(data->peer);
+ data->peer = NULL;
+ data->peers = 0;
+
+ free(inst[u]->impl);
+ inst[u]->impl = NULL;
+ }
free(cfg.mdns_name);
if(cfg.mdns_fd >= 0){
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