Skip to content

Changed ssdp templates to include deviceType #1753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igrr merged 4 commits into from
Mar 23, 2016
Merged

Changed ssdp templates to include deviceType #1753

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8d855c
Changed templates to include deviceType
jeremyalangreen Mar 11, 2016
bd24fc2
Merge branch 'master' into ssdp-fixes
jeremyalangreen Mar 11, 2016
04deb7e
added comments for clarity
jeremyalangreen Mar 16, 2016
e54e387
Merge remote-tracking branch 'esp8266/master' into ssdp-fixes
jeremyalangreen Mar 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions libraries/ESP8266SSDP/ESP8266SSDP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,19 @@ static const IPAddress SSDP_MULTICAST_ADDR(239, 255, 255, 250);

static const char* _ssdp_response_template =
"HTTP/1.1 200 OK\r\n"
"EXT:\r\n"
"ST: upnp:rootdevice\r\n";
"EXT:\r\n";

static const char* _ssdp_notify_template =
"NOTIFY * HTTP/1.1\r\n"
"HOST: 239.255.255.250:1900\r\n"
"NT: upnp:rootdevice\r\n"
"NTS: ssdp:alive\r\n";

static const char* _ssdp_packet_template =
"%s" // _ssdp_response_template / _ssdp_notify_template
"CACHE-CONTROL: max-age=%u\r\n" // SSDP_INTERVAL
"SERVER: Arduino/1.0 UPNP/1.1 %s/%s\r\n" // _modelName, _modelNumber
"USN: uuid:%s\r\n" // _uuid
"%s: %s\r\n" // "NT" or "ST", _deviceType
"LOCATION: http://%u.%u.%u.%u:%u/%s\r\n" // WiFi.localIP(), _port, _schemaURL
"\r\n";

Expand Down Expand Up @@ -207,6 +206,8 @@ void SSDPClass::_send(ssdp_method_t method){
(method == NONE)?_ssdp_response_template:_ssdp_notify_template,
SSDP_INTERVAL,
_modelName, _modelNumber,
(method == NONE)?"ST":"NT",
_deviceType,
_uuid,
IP2STR(&ip), _port, _schemaURL
);
Expand Down