+/**
+ * Copyright (C) 2012-2013 Juho Vähä-Herttua
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
#include <stdlib.h>
#include <stdio.h>
#include <math.h>
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;
while ((arg = *++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;
}
dnssd_t *dnssd;
raop_t *raop;
raop_callbacks_t raop_cbs;
+ char *password = NULL;
int error;
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, hwaddr, sizeof(hwaddr), password);
error = 0;
dnssd = dnssd_init(&error);
fprintf(stderr, "------------------------------------------\n");
fprintf(stderr, "You could try the following resolutions based on your OS:\n");
fprintf(stderr, "Windows: Try installing http://support.apple.com/kb/DL999\n");
- fprintf(stderr, "Debian/Ubuntu: Try installing libavahi-compat-libdnssd1 package\n");
+ fprintf(stderr, "Debian/Ubuntu: Try installing libavahi-compat-libdnssd-dev package\n");
raop_destroy(raop);
return -1;
}
dnssd_register_raop(dnssd, options.apname, options.port, hwaddr, sizeof(hwaddr), 0);
- dnssd_register_airplay(dnssd, options.apname, 1234, hwaddr, sizeof(hwaddr));
running = 1;
while (running) {