Add plugin ABI versioning checks

aac.c

@@ -535,3 +535,4 @@ const int ip_priority = 50;
 const char * const ip_extensions[] = { "aac", NULL };
 const char * const ip_mime_types[] = { "audio/aac", "audio/aacp", NULL };
 const struct input_plugin_opt ip_options[] = { { NULL } };
+const unsigned ip_abi_version = IP_ABI_VERSION;

alsa.c

@@ -377,3 +377,4 @@ const struct output_plugin_opt op_pcm_options[] = {
 };
 
 const int op_priority = 0;
+const unsigned op_abi_version = OP_ABI_VERSION;

ao.c

@@ -305,3 +305,4 @@ const struct output_plugin_opt op_pcm_options[] = {
 };
 
 const int op_priority = 3;
+const unsigned op_abi_version = OP_ABI_VERSION;

arts.c

@@ -120,3 +120,4 @@ const struct output_plugin_opt op_pcm_options[] = {
 };
 
 const int op_priority = 4;
+const unsigned op_abi_version = OP_ABI_VERSION;

cdio.c

@@ -544,3 +544,4 @@ const struct input_plugin_opt ip_options[] = {
 const int ip_priority = 50;
 const char * const ip_extensions[] = { NULL };
 const char * const ip_mime_types[] = { "x-content/audio-cdda", NULL };
+const unsigned ip_abi_version = IP_ABI_VERSION;

coreaudio.c

@@ -872,3 +872,4 @@ const struct mixer_plugin_opt op_mixer_options[] = {
 };
 
 const int op_priority = 1;
+const unsigned op_abi_version = OP_ABI_VERSION;

cue.c

@@ -397,3 +397,4 @@ const int ip_priority = 50;
 const char * const ip_extensions[] = { NULL };
 const char * const ip_mime_types[] = { "application/x-cue", NULL };
 const struct input_plugin_opt ip_options[] = { { NULL } };
+const unsigned ip_abi_version = IP_ABI_VERSION;

ffmpeg.c

@@ -685,3 +685,4 @@ const char *const ip_extensions[] = {
 };
 const char *const ip_mime_types[] = { NULL };
 const struct input_plugin_opt ip_options[] = { { NULL } };
+const unsigned ip_abi_version = IP_ABI_VERSION;

flac.c

@@ -589,3 +589,4 @@ const int ip_priority = 50;
 const char * const ip_extensions[] = { "flac", "fla", NULL };
 const char * const ip_mime_types[] = { NULL };
 const struct input_plugin_opt ip_options[] = { { NULL } };
+const unsigned ip_abi_version = IP_ABI_VERSION;

input.c

@@ -510,6 +510,8 @@ void ip_load_plugins(void)
 		void *so;
 		char *ext;
 		const int *priority_ptr;
+		const unsigned *abi_version_ptr;
+		bool err = false;
 
 		if (d->d_name[0] == '.')
 			continue;
@@ -529,13 +531,21 @@ void ip_load_plugins(void)
 
 		ip = xnew(struct ip, 1);
 
+		abi_version_ptr = dlsym(so, "ip_abi_version");
 		priority_ptr = dlsym(so, "ip_priority");
 		ip->extensions = dlsym(so, "ip_extensions");
 		ip->mime_types = dlsym(so, "ip_mime_types");
 		ip->ops = dlsym(so, "ip_ops");
 		ip->options = dlsym(so, "ip_options");
 		if (!priority_ptr || !ip->extensions || !ip->mime_types || !ip->ops || !ip->options) {
 			error_msg("%s: missing symbol", filename);
+			err = true;
+		}
+		if (!abi_version_ptr || *abi_version_ptr != IP_ABI_VERSION) {
+			error_msg("%s: incompatible plugin version", filename);
+			err = true;
+		}
+		if (err) {
 			free(ip);
 			dlclose(so);
 			continue;

ip.h

@@ -28,6 +28,8 @@
 #include <unistd.h>
 #endif
 
+#define IP_ABI_VERSION 1
+
 enum {
 	/* no error */
 	IP_ERROR_SUCCESS,
@@ -109,5 +111,6 @@ extern const int ip_priority;
 extern const char * const ip_extensions[];
 extern const char * const ip_mime_types[];
 extern const struct input_plugin_opt ip_options[];
+extern const unsigned ip_abi_version;
 
 #endif

jack.c

@@ -629,3 +629,4 @@ const struct output_plugin_opt op_pcm_options[] = {
 };
 
 const int op_priority = 2;
+const unsigned op_abi_version = OP_ABI_VERSION;

mad.c

@@ -281,3 +281,4 @@ const char * const ip_mime_types[] = {
 	"audio/mpeg", "audio/x-mp3", "audio/x-mpeg", NULL
 };
 const struct input_plugin_opt ip_options[] = { { NULL } };
+const unsigned ip_abi_version = IP_ABI_VERSION;

mikmod.c

@@ -173,3 +173,4 @@ const char * const ip_extensions[] = {
 };
 const char * const ip_mime_types[] = { NULL };
 const struct input_plugin_opt ip_options[] = { { NULL } };
+const unsigned ip_abi_version = IP_ABI_VERSION;

modplug.c

@@ -241,3 +241,4 @@ const char * const ip_extensions[] = {
 };
 const char * const ip_mime_types[] = { NULL };
 const struct input_plugin_opt ip_options[] = { { NULL } };
+const unsigned ip_abi_version = IP_ABI_VERSION;

mp4.c

@@ -601,3 +601,4 @@ const int ip_priority = 50;
 const char * const ip_extensions[] = { "mp4", "m4a", "m4b", NULL };
 const char * const ip_mime_types[] = { /*"audio/mp4", "audio/mp4a-latm",*/ NULL };
 const struct input_plugin_opt ip_options[] = { { NULL } };
+const unsigned ip_abi_version = IP_ABI_VERSION;

mpc.c

@@ -461,3 +461,4 @@ const int ip_priority = 50;
 const char *const ip_extensions[] = { "mpc", "mpp", "mp+", NULL };
 const char *const ip_mime_types[] = { "audio/x-musepack", NULL };
 const struct input_plugin_opt ip_options[] = { { NULL } };
+const unsigned ip_abi_version = IP_ABI_VERSION;

op.h

@@ -26,6 +26,8 @@
 #include <fcntl.h>
 #endif
 
+#define OP_ABI_VERSION 1
+
 enum {
 	/* no error */
 	OP_ERROR_SUCCESS,
@@ -75,5 +77,6 @@ struct output_plugin_opt {
 extern const struct output_plugin_ops op_pcm_ops;
 extern const struct output_plugin_opt op_pcm_options[];
 extern const int op_priority;
+extern const unsigned op_abi_version;
 
 #endif

opus.c

@@ -331,3 +331,4 @@ const int ip_priority = 50;
 const char * const ip_extensions[] = { "opus", NULL };
 const char * const ip_mime_types[] = { NULL };
 const struct input_plugin_opt ip_options[] = { { NULL } };
+const unsigned ip_abi_version = IP_ABI_VERSION;

oss.c

@@ -255,3 +255,4 @@ const struct output_plugin_opt op_pcm_options[] = {
 };
 
 const int op_priority = 1;
+const unsigned op_abi_version = OP_ABI_VERSION;

output.c

@@ -95,6 +95,8 @@ void op_load_plugins(void)
 		struct output_plugin *plug;
 		void *so, *symptr;
 		char *ext;
+		const unsigned *abi_version_ptr;
+		bool err = false;
 
 		if (d->d_name[0] == '.')
 			continue;
@@ -117,8 +119,16 @@ void op_load_plugins(void)
 		plug->pcm_ops = dlsym(so, "op_pcm_ops");
 		plug->pcm_options = dlsym(so, "op_pcm_options");
 		symptr = dlsym(so, "op_priority");
+		abi_version_ptr = dlsym(so, "op_abi_version");
 		if (!plug->pcm_ops || !plug->pcm_options || !symptr) {
 			error_msg("%s: missing symbol", filename);
+			err = true;
+		}
+		if (!abi_version_ptr || *abi_version_ptr != OP_ABI_VERSION) {
+			error_msg("%s: incompatible plugin version", filename);
+			err = true;
+		}
+		if (err) {
 			free(plug);
 			dlclose(so);
 			continue;

pulse.c

@@ -595,3 +595,4 @@ const struct mixer_plugin_opt op_mixer_options[] = {
 };
 
 const int op_priority = -2;
+const unsigned op_abi_version = OP_ABI_VERSION;

roar.c

@@ -366,3 +366,4 @@ const struct mixer_plugin_opt op_mixer_options[] = {
 };
 
 const int op_priority = -1;
+const unsigned op_abi_version = OP_ABI_VERSION;

sndio.c

@@ -252,3 +252,4 @@ const struct mixer_plugin_opt op_mixer_options[] = {
 };
 
 const int op_priority = 2;
+const unsigned op_abi_version = OP_ABI_VERSION;

sun.c

@@ -248,3 +248,4 @@ const struct output_plugin_opt op_pcm_options[] = {
 };
 
 const int op_priority = 0;
+const unsigned op_abi_version = OP_ABI_VERSION;

vorbis.c

@@ -411,3 +411,4 @@ const int ip_priority = 50;
 const char * const ip_extensions[] = { "ogg", "oga", "ogx", NULL };
 const char * const ip_mime_types[] = { "application/ogg", "audio/x-ogg", NULL };
 const struct input_plugin_opt ip_options[] = { { NULL } };
+const unsigned ip_abi_version = IP_ABI_VERSION;

vtx.c

@@ -186,3 +186,4 @@ const int ip_priority = 50;
 const char * const ip_extensions[] = {"vtx", NULL};
 const char * const ip_mime_types[] = { NULL };
 const struct input_plugin_opt ip_options[] = { { NULL } };
+const unsigned ip_abi_version = IP_ABI_VERSION;

wav.c

@@ -414,3 +414,4 @@ const int ip_priority = 50;
 const char * const ip_extensions[] = { "wav", NULL };
 const char * const ip_mime_types[] = { NULL };
 const struct input_plugin_opt ip_options[] = { { NULL } };
+const unsigned ip_abi_version = IP_ABI_VERSION;

waveout.c

@@ -306,3 +306,4 @@ const struct output_plugin_opt op_pcm_options[] = {
 };
 
 const int op_priority = 0;
+const unsigned op_abi_version = OP_ABI_VERSION;

wavpack.c

@@ -431,3 +431,4 @@ const int ip_priority = 50;
 const char * const ip_extensions[] = { "wv", NULL };
 const char * const ip_mime_types[] = { "audio/x-wavpack", NULL };
 const struct input_plugin_opt ip_options[] = { { NULL } };
+const unsigned ip_abi_version = IP_ABI_VERSION;