Skip to content
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

Jump to bottom

Set a value for SSDP notify interval #7110

Merged
merged 4 commits into from
Mar 3, 2020
Merged

Set a value for SSDP notify interval #7110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d77545c
Set a value for SSDP notify interval, default to 1200 seconds.
Feb 25, 2020
20694bd
Changed uint8_t to uint32_t
Mar 2, 2020
64e345e
Merge branch 'master' into master
PA4WD Mar 2, 2020
8a8c912
Merge branch 'master' into master
d-a-v Mar 3, 2020
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
12 changes: 8 additions & 4 deletions libraries/ESP8266SSDP/ESP8266SSDP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ static const char _ssdp_notify_template[] PROGMEM =

static const char _ssdp_packet_template[] PROGMEM =
"%s" // _ssdp_response_template / _ssdp_notify_template
"CACHE-CONTROL: max-age=%u\r\n" // SSDP_INTERVAL
"CACHE-CONTROL: max-age=%u\r\n" // _interval
"SERVER: Arduino/1.0 UPNP/1.1 %s/%s\r\n" // _modelName, _modelNumber
"USN: %s\r\n" // _uuid
"%s: %s\r\n" // "NT" or "ST", _deviceType
Expand Down Expand Up @@ -130,6 +130,7 @@ SSDPClass::SSDPClass() :
_timer(0),
_port(80),
_ttl(SSDP_MULTICAST_TTL),
_interval(SSDP_INTERVAL),
_respondToAddr(0,0,0,0),
_respondToPort(0),
_pending(false),
Expand Down Expand Up @@ -241,7 +242,7 @@ void SSDPClass::_send(ssdp_method_t method) {
int len = snprintf_P(buffer, sizeof(buffer),
_ssdp_packet_template,
valueBuffer,
SSDP_INTERVAL,
_interval,
_modelName,
_modelNumber,
_uuid,
Expand Down Expand Up @@ -428,7 +429,7 @@ void SSDPClass::_update() {
if (_pending && (millis() - _process_time) > _delay) {
_pending = false; _delay = 0;
_send(NONE);
} else if(_notify_time == 0 || (millis() - _notify_time) > (SSDP_INTERVAL * 1000L)){
} else if(_notify_time == 0 || (millis() - _notify_time) > (_interval * 1000L)){
_notify_time = millis();
_st_is_uuid = false;
_send(NOTIFY);
Expand Down Expand Up @@ -493,11 +494,14 @@ void SSDPClass::setManufacturerURL(const char *url) {
strlcpy(_manufacturerURL, url, sizeof(_manufacturerURL));
}


void SSDPClass::setTTL(const uint8_t ttl) {
_ttl = ttl;
}

void SSDPClass::setInterval(uint32_t interval) {
_interval = interval;
}

void SSDPClass::_onTimerStatic(SSDPClass* self) {
self->_update();
}
Expand Down
6 changes: 4 additions & 2 deletions libraries/ESP8266SSDP/ESP8266SSDP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ class SSDPClass{
void setUUID(const String& uuid) { setUUID(uuid.c_str()); }
void setUUID(const char *uuid);

void setName(const String& name) { setName(name.c_str()); }
void setName(const String& name) { setName(name.c_str()); }
void setName(const char *name);
void setURL(const String& url) { setURL(url.c_str()); }
void setURL(const char *url);
void setSchemaURL(const String& url) { setSchemaURL(url.c_str()); }
void setSchemaURL(const char *url);
void setSerialNumber(const String& serialNumber) { setSerialNumber(serialNumber.c_str()); }
void setSerialNumber(const String& serialNumber) { setSerialNumber(serialNumber.c_str()); }
void setSerialNumber(const char *serialNumber);
void setSerialNumber(const uint32_t serialNumber);
void setModelName(const String& name) { setModelName(name.c_str()); }
Expand All @@ -92,6 +92,7 @@ class SSDPClass{
void setManufacturerURL(const char *url);
void setHTTPPort(uint16_t port);
void setTTL(uint8_t ttl);
void setInterval(uint32_t interval);

protected:
void _send(ssdp_method_t method);
Expand All @@ -104,6 +105,7 @@ class SSDPClass{
SSDPTimer* _timer;
uint16_t _port;
uint8_t _ttl;
uint32_t _interval;

IPAddress _respondToAddr;
uint16_t _respondToPort;
Expand Down