X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fshairplay.c;h=4b873f127a4bf411cec0dbc03ff0c052faad5ccc;hb=1e8b64fdcd07264fcb0577d4fad13428b6cfdd7c;hp=691b24f36f59941117552478dc571c521994970a;hpb=668e175b7b1a9e0c8afdc4e01ddbc9c7ac96fdd2;p=deb_shairplay.git

diff --git a/src/shairplay.c b/src/shairplay.c
index 691b24f..4b873f1 100644
--- a/src/shairplay.c
+++ b/src/shairplay.c
@@ -43,6 +43,7 @@ typedef struct {
 	char apname[56];
 	char password[56];
 	unsigned short port;
+	char hwaddr[6];
 
 	char ao_driver[56];
 	char ao_devicename[56];
@@ -90,6 +91,33 @@ init_signals(void)
 #endif
 
 
+static int
+parse_hwaddr(const char *str, char *hwaddr, int hwaddrlen)
+{
+	int slen, i;
+
+	slen = 3*hwaddrlen-1;
+	if (strlen(str) != slen) {
+		return 1;
+	}
+	for (i=0; i<slen; i++) {
+		if (str[i] == ':' && (i%3 == 2)) {
+			continue;
+		}
+		if (str[i] >= '0' && str[i] <= '9') {
+			continue;
+		}
+		if (str[i] >= 'a' && str[i] <= 'f') {
+			continue;
+		}
+		return 1;
+	}
+	for (i=0; i<hwaddrlen; i++) {
+		hwaddr[i] = (char) strtol(str+(i*3), NULL, 16);
+	}
+	return 0;
+}
+
 static ao_device *
 audio_open_device(shairplay_options_t *opt, int bits, int channels, int samplerate)
 {
@@ -106,7 +134,6 @@ audio_open_device(shairplay_options_t *opt, int bits, int channels, int samplera
 	}
 
 	/* Add all available libao options */
-	ao_append_option(&ao_options, "client_name", opt->apname);
 	if (strlen(opt->ao_devicename)) {
 		ao_append_option(&ao_options, "dev", opt->ao_devicename);
 	}
@@ -223,11 +250,15 @@ audio_set_volume(void *cls, void *opaque, float volume)
 static int
 parse_options(shairplay_options_t *opt, int argc, char *argv[])
 {
+	const char default_hwaddr[] = { 0x48, 0x5d, 0x60, 0x7c, 0xee, 0x22 };
+
 	char *path = argv[0];
 	char *arg;
 
-	strcpy(opt->apname, "Shairplay");
+	/* Set default values for apname and port */
+	strncpy(opt->apname, "Shairplay", sizeof(opt->apname)-1);
 	opt->port = 5000;
+	memcpy(opt->hwaddr, default_hwaddr, sizeof(opt->hwaddr));
 
 	while ((arg = *++argv)) {
 		if (!strcmp(arg, "-a")) {
@@ -242,6 +273,12 @@ parse_options(shairplay_options_t *opt, int argc, char *argv[])
 			opt->port = atoi(*++argv);
 		} else if (!strncmp(arg, "--server_port=", 14)) {
 			opt->port = atoi(arg+14);
+		} else if (!strncmp(arg, "--hwaddr=", 9)) {
+			if (parse_hwaddr(arg+9, opt->hwaddr, sizeof(opt->hwaddr))) {
+				fprintf(stderr, "Invalid format given for hwaddr, aborting...\n");
+				fprintf(stderr, "Please use hwaddr format: 01:45:89:ab:cd:ef\n");
+				return 1;
+			}
 		} else if (!strncmp(arg, "--ao_driver=", 12)) {
 			strncpy(opt->ao_driver, arg+12, sizeof(opt->ao_driver)-1);
 		} else if (!strncmp(arg, "--ao_devicename=", 16)) {
@@ -255,6 +292,7 @@ parse_options(shairplay_options_t *opt, int argc, char *argv[])
 			fprintf(stderr, "  -a, --apname=AirPort            Sets Airport name\n");
 			fprintf(stderr, "  -p, --password=secret           Sets password\n");
 			fprintf(stderr, "  -o, --server_port=5000          Sets port for RAOP service\n");
+			fprintf(stderr, "      --hwaddr=address            Sets the MAC address, useful if running multiple instances\n");
 			fprintf(stderr, "      --ao_driver=driver          Sets the ao driver (optional)\n");
 			fprintf(stderr, "      --ao_devicename=devicename  Sets the ao device name (optional)\n");
 			fprintf(stderr, "      --ao_deviceid=id            Sets the ao device id (optional)\n");
@@ -264,27 +302,19 @@ parse_options(shairplay_options_t *opt, int argc, char *argv[])
 		}
 	}
 
-	/* Set default values for apname and port */
-	if (!strlen(opt->apname)) {
-		strncpy(opt->apname, "Shairplay", sizeof(opt->apname)-1);
-	}
-	if (!opt->port) {
-		opt->port = 5000;
-	}
 	return 0;
 }
 
 int
 main(int argc, char *argv[])
 {
-	const char hwaddr[] = { 0x48, 0x5d, 0x60, 0x7c, 0xee, 0x22 };
-
 	shairplay_options_t options;
 	ao_device *device = NULL;
 
 	dnssd_t *dnssd;
 	raop_t *raop;
 	raop_callbacks_t raop_cbs;
+	char *password = NULL;
 
 	int error;
 
@@ -319,11 +349,15 @@ main(int argc, char *argv[])
 	raop = raop_init_from_keyfile(10, &raop_cbs, "airport.key", NULL);
 	if (raop == NULL) {
 		fprintf(stderr, "Could not initialize the RAOP service\n");
+		fprintf(stderr, "Please make sure the airport.key file is in the current directory.\n");
 		return -1;
 	}
 
+	if (strlen(options.password)) {
+		password = options.password;
+	}
 	raop_set_log_level(raop, RAOP_LOG_DEBUG);
-	raop_start(raop, &options.port, hwaddr, sizeof(hwaddr), NULL);
+	raop_start(raop, &options.port, options.hwaddr, sizeof(options.hwaddr), password);
 
 	error = 0;
 	dnssd = dnssd_init(&error);
@@ -337,7 +371,7 @@ main(int argc, char *argv[])
 		return -1;
 	}
 
-	dnssd_register_raop(dnssd, options.apname, options.port, hwaddr, sizeof(hwaddr), 0);
+	dnssd_register_raop(dnssd, options.apname, options.port, options.hwaddr, sizeof(options.hwaddr), 0);
 
 	running = 1;
 	while (running) {