MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-24 22:25:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add enough more UPnP discovery that it shows up on SoundBridge

Browse Source
This commit is contained in:
Ron Pedde 2007-05-05 04:35:50 +00:00
parent 648297e253
commit 7f5e364954
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin-root/upnp-basic.xml
View File

@ -6,7 +6,7 @@
</specVersion> </specVersion>
<device> <device>
<deviceType>urn:schemas-upnp-org:device:MediaServer:1</deviceType> <deviceType>urn:schemas-upnp-org:device:MediaServer:1</deviceType>
<friendlyName>@servername@</friendlyName> <friendlyName>UPnP: @servername@</friendlyName>
<manufacturer>Firefly Media Services</manufacturer> <manufacturer>Firefly Media Services</manufacturer>
<manufacturerURL>http://www.fireflymediaserver.org/</manufacturerURL> <manufacturerURL>http://www.fireflymediaserver.org/</manufacturerURL>
<modelDescription>Firefly Media Server (version @version@)</modelDescription> <modelDescription>Firefly Media Server (version @version@)</modelDescription>

41
src/upnp.c
View File

@ -173,6 +173,8 @@ void upnp_build_packet(char *packet, int len, int type,
} }
if(pi->padinfo->location) { if(pi->padinfo->location) {
/* Note that UPnP spec says this SHOULD be ip address,
* not FQDN. Roku SB, for example, doesn't like FQDN. */
gethostname(hostname,sizeof(hostname)); gethostname(hostname,sizeof(hostname));
snprintf(buffer,sizeof(buffer),"LOCATION: http://%s:%d%s\r\n", snprintf(buffer,sizeof(buffer),"LOCATION: http://%s:%d%s\r\n",
hostname,port,pi->padinfo->location); hostname,port,pi->padinfo->location);
@ -210,21 +212,28 @@ void upnp_build_packet(char *packet, int len, int type,
case UPNP_AD_DEVICE: case UPNP_AD_DEVICE:
case UPNP_AD_SERVICE: case UPNP_AD_SERVICE:
case UPNP_AD_ROOT: case UPNP_AD_ROOT:
snprintf(buffer,sizeof(buffer),"USN: uuid:%s::%s:%s",upnp_uuid(), snprintf(buffer,sizeof(buffer),"USN: uuid:%s::%s:%s%s",upnp_uuid(),
pi->padinfo->namespace, pi->padinfo->name); pi->padinfo->namespace,
(pi->padinfo->type == UPNP_AD_DEVICE) ? "device:" :
((pi->padinfo->type == UPNP_AD_SERVICE) ? "service:" : ""),
pi->padinfo->name);
len=upnp_strcat(buffer,packet,len); len=upnp_strcat(buffer,packet,len);
if(pi->padinfo->version) { if(pi->padinfo->version) {
snprintf(buffer,sizeof(buffer),"%d",pi->padinfo->version); snprintf(buffer,sizeof(buffer),":%d",pi->padinfo->version);
len=upnp_strcat(buffer,packet,len); len=upnp_strcat(buffer,packet,len);
} }
len=upnp_strcat("\r\n",packet,len); len=upnp_strcat("\r\n",packet,len);
if(type != UPNP_TYPE_RESPONSE) { /* no NT for responses */ if(type != UPNP_TYPE_RESPONSE) { /* no NT for responses */
snprintf(buffer,sizeof(buffer),"NT: %s:%s", snprintf(buffer,sizeof(buffer),"NT: %s:%s%s",
pi->padinfo->namespace, pi->padinfo->name); pi->padinfo->namespace,
(pi->padinfo->type == UPNP_AD_DEVICE) ? "device:" :
((pi->padinfo->type == UPNP_AD_SERVICE) ? "service:":""),
pi->padinfo->name);
len=upnp_strcat(buffer,packet,len); len=upnp_strcat(buffer,packet,len);
if(pi->padinfo->version) { if(pi->padinfo->version) {
snprintf(buffer,sizeof(buffer),"%d",pi->padinfo->version); snprintf(buffer,sizeof(buffer),":%d",pi->padinfo->version);
len=upnp_strcat(buffer,packet,len); len=upnp_strcat(buffer,packet,len);
} }
len=upnp_strcat("\r\n",packet,len); len=upnp_strcat("\r\n",packet,len);
@ -303,6 +312,23 @@ void upnp_broadcast(int type, UPNP_DISCO *pdisco) {
(!strcasecmp((char*)&pdisco->query[5],upnp_uuid())) && (!strcasecmp((char*)&pdisco->query[5],upnp_uuid())) &&
(pi->padinfo->type == UPNP_AD_UUID)) { (pi->padinfo->type == UPNP_AD_UUID)) {
send_packet = 1; send_packet = 1;
} else if((elements == 5) &&
(strcasecmp(argv[2],"device")==0)) {
if((pi->padinfo->type == UPNP_AD_DEVICE) &&
(strcasecmp((char*)&pi->padinfo->namespace[4],argv[1])==0) &&
(strcasecmp(pi->padinfo->name,argv[3])==0) &&
(pi->padinfo->version >= atoi(argv[4]))) {
send_packet = 1;
}
} else if((elements == 5) &&
(strcasecmp(argv[2],"service")==0)) {
if((pi->padinfo->type == UPNP_AD_SERVICE) &&
(strcasecmp((char*)&pi->padinfo->namespace[4],argv[1])==0) &&
(strcasecmp(pi->padinfo->name,argv[3])==0) &&
(pi->padinfo->version >= atoi(argv[4]))) {
send_packet = 1;
}
} }
} }
@ -575,6 +601,9 @@ void upnp_process_packet(void) {
memset(pdisco,0,sizeof(UPNP_DISCO)); memset(pdisco,0,sizeof(UPNP_DISCO));
if(mx) { if(mx) {
pdisco->seconds_remaining = (rand() / (RAND_MAX/mx)) + 1; pdisco->seconds_remaining = (rand() / (RAND_MAX/mx)) + 1;
if(mx + 1 > UPNP_SELECT_TIMEOUT)
pdisco->seconds_remaining = 0;
DPRINTF(E_DBG,L_MISC,"Responding in %d (of %d) seconds\n", DPRINTF(E_DBG,L_MISC,"Responding in %d (of %d) seconds\n",
pdisco->seconds_remaining, mx); pdisco->seconds_remaining, mx);
} }