aaribaud/ESPSomfy-RTS
0
0
Fork 0
mirror of https://github.com/rstrouse/ESPSomfy-RTS.git synced 2025-12-13 11:02:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix udp packets for SSDP

Browse source
This commit is contained in:
Robert Strouse 2024-01-13 20:30:58 -08:00
parent e7777b10c1
commit 1b35c7d835
8 changed files with 130 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Network.cpp
View file

@ -187,11 +187,17 @@ void Network::setConnected(conn_types connType) {
//SSDP.setSerialNumber(0, "C2496952-5610-47E6-A968-2FC19737A0DB"); //SSDP.setSerialNumber(0, "C2496952-5610-47E6-A968-2FC19737A0DB");
//SSDP.setUUID(0, settings.uuid); //SSDP.setUUID(0, settings.uuid);
SSDP.setModelName(0, "ESPSomfy RTS"); SSDP.setModelName(0, "ESPSomfy RTS");
SSDP.setModelNumber(0, "SS v1"); if(strlen(settings.chipModel) == 0) SSDP.setModelNumber(0, "ESP32");
else {
char sModel[20] = "";
snprintf(sModel, sizeof(sModel), "ESP32-%S", settings.chipModel);
SSDP.setModelNumber(0, sModel);
}
SSDP.setModelURL(0, "https://github.com/rstrouse/ESPSomfy-RTS"); SSDP.setModelURL(0, "https://github.com/rstrouse/ESPSomfy-RTS");
SSDP.setManufacturer(0, "rstrouse"); SSDP.setManufacturer(0, "rstrouse");
SSDP.setManufacturerURL(0, "https://github.com/rstrouse"); SSDP.setManufacturerURL(0, "https://github.com/rstrouse");
SSDP.setURL(0, "/"); SSDP.setURL(0, "/");
SSDP.setActive(0, true);
if(MDNS.begin(settings.hostname)) { if(MDNS.begin(settings.hostname)) {
Serial.printf("MDNS Responder Started: serverId=%s\n", settings.serverId); Serial.printf("MDNS Responder Started: serverId=%s\n", settings.serverId);
//MDNS.addService("http", "tcp", 80); //MDNS.addService("http", "tcp", 80);

246
SSDP.cpp
View file

@ -10,12 +10,15 @@
#define SSDP_URI_SIZE 2 #define SSDP_URI_SIZE 2
#define SSDP_BUFFER_SIZE 64 #define SSDP_BUFFER_SIZE 64
#define SSDP_MULTICAST_ADDR 239, 255, 255, 250 #define SSDP_MULTICAST_ADDR 239, 255, 255, 250
//#define DEBUG_SSDP Serial
//#define DEBUG_SSDP_PACKET Serial
extern ConfigSettings settings; extern ConfigSettings settings;
static const char _ssdp_uuid_template[] PROGMEM = "C2496952-5610-47E6-A968-2FC1%02x%02x%02x%02x"; static const char _ssdp_uuid_template[] PROGMEM = "C2496952-5610-47E6-A968-2FC1%02X%02X%02X%02X";
static const char _ssdp_serial_number_template[] PROGMEM = "ESP32-%02x%02x%02x"; static const char _ssdp_serial_number_template[] PROGMEM = "ESP32-%02x%02x%02x";
static const char _ssdp_usn_root_template[] PROGMEM = "%s::upnp::rootdevice"; static const char _ssdp_usn_root_template[] PROGMEM = "uuid:%s::upnp:rootdevice";
static const char _ssdp_usn_uuid_template[] PROGMEM = "%s::%s"; static const char _ssdp_usn_uuid_template[] PROGMEM = "uuid:%s";
static const char _ssdp_usn_urn_template[] PROGMEM = "uuid:%s::%s";
static const char _ssdp_response_template[] PROGMEM = static const char _ssdp_response_template[] PROGMEM =
"HTTP/1.1 200 OK\r\n" "HTTP/1.1 200 OK\r\n"
"EXT:\r\n"; "EXT:\r\n";
@ -26,7 +29,10 @@ static const char _ssdp_notify_template[] PROGMEM =
static const char _ssdp_bye_template[] PROGMEM = static const char _ssdp_bye_template[] PROGMEM =
"NOTIFY * HTTP/1.1\r\n" "NOTIFY * HTTP/1.1\r\n"
"HOST: 239.255.255.250:1900\r\n" "HOST: 239.255.255.250:1900\r\n"
"NTS: ssdp:byebye\r\n"; "NTS: ssdp:byebye\r\n"
"NT: %s\r\n"
"USN: %s\r\n"
"\r\n";
static const char _ssdp_packet_template[] PROGMEM = static const char _ssdp_packet_template[] PROGMEM =
"%s" // _ssdp_response_template / _ssdp_notify_template "%s" // _ssdp_response_template / _ssdp_notify_template
"CACHE-CONTROL: max-age=%u\r\n" // _interval "CACHE-CONTROL: max-age=%u\r\n" // _interval
@ -46,7 +52,7 @@ static const char _ssdp_device_schema_template[] PROGMEM =
"<modelURL>%s</modelURL>" "<modelURL>%s</modelURL>"
"<manufacturer>%s</manufacturer>" "<manufacturer>%s</manufacturer>"
"<manufacturerURL>%s</manufacturerURL>" "<manufacturerURL>%s</manufacturerURL>"
"<modelDescription>Somfy RTS Controller</modelDescription>" "<modelDescription>ESPSomfy RTS Controller</modelDescription>"
"<firmwareVersion>%s</firmwareVersion>" "<firmwareVersion>%s</firmwareVersion>"
"<UDN>%s</UDN>" "<UDN>%s</UDN>"
"<serviceList></serviceList>" "<serviceList></serviceList>"
@ -87,7 +93,7 @@ UPNPDeviceType::UPNPDeviceType(const char *deviceType) { this->setDeviceType(dev
UPNPDeviceType::UPNPDeviceType(const char *deviceType, const char *uuid){ this->setDeviceType(deviceType); this->setUUID(uuid); } UPNPDeviceType::UPNPDeviceType(const char *deviceType, const char *uuid){ this->setDeviceType(deviceType); this->setUUID(uuid); }
UPNPDeviceType::UPNPDeviceType(const char *deviceType, const char *uuid, const char*friendlyName) { this->setDeviceType(deviceType); this->setUUID(uuid); this->setName(friendlyName);} UPNPDeviceType::UPNPDeviceType(const char *deviceType, const char *uuid, const char*friendlyName) { this->setDeviceType(deviceType); this->setUUID(uuid); this->setName(friendlyName);}
void UPNPDeviceType::setSchemaURL(const char *url) { strlcpy(schemaURL, url, sizeof(schemaURL)); } void UPNPDeviceType::setSchemaURL(const char *url) { strlcpy(schemaURL, url, sizeof(schemaURL)); }
void UPNPDeviceType::setDeviceType(const char *dtype) { strlcpy(deviceType, dtype, sizeof(deviceType)); } void UPNPDeviceType::setDeviceType(const char *dtype) { strlcpy(this->deviceType, dtype, sizeof(deviceType)); }
void UPNPDeviceType::setUUID(const char *id) { snprintf_P(uuid, sizeof(uuid), PSTR("uuid:%s"), id); } void UPNPDeviceType::setUUID(const char *id) { snprintf_P(uuid, sizeof(uuid), PSTR("uuid:%s"), id); }
void UPNPDeviceType::setName(const char *name) { strlcpy(friendlyName, name, sizeof(friendlyName)); } void UPNPDeviceType::setName(const char *name) { strlcpy(friendlyName, name, sizeof(friendlyName)); }
void UPNPDeviceType::setURL(const char *url) { strlcpy(presentationURL, url, sizeof(presentationURL)); } void UPNPDeviceType::setURL(const char *url) { strlcpy(presentationURL, url, sizeof(presentationURL)); }
@ -100,25 +106,28 @@ void UPNPDeviceType::setManufacturer(const char *name) { strlcpy(manufacturer, n
void UPNPDeviceType::setManufacturerURL(const char *url) { strlcpy(manufacturerURL, url, sizeof(manufacturerURL)); } void UPNPDeviceType::setManufacturerURL(const char *url) { strlcpy(manufacturerURL, url, sizeof(manufacturerURL)); }
//char * UPNPDeviceType::getUSN() { return this->getUSN(this->deviceType); } //char * UPNPDeviceType::getUSN() { return this->getUSN(this->deviceType); }
char * UPNPDeviceType::getUSN(const char *st) { char * UPNPDeviceType::getUSN(const char *st) {
#ifdef DEBUG_SSDP //#ifdef DEBUG_SSDP
DEBUG_SSDP.print("GETUSN ST: "); //DEBUG_SSDP.print("GETUSN ST: ");
DEBUG_SSDP.println(st); //DEBUG_SSDP.println(st);
DEBUG_SSDP.print("GETUSN UUID: "); //DEBUG_SSDP.print("GETUSN UUID: ");
DEBUG_SSDP.println(this->uuid); //DEBUG_SSDP.println(this->uuid);
DEBUG_SSDP.print("sizeof(this->m_usn)"); //DEBUG_SSDP.print("sizeof(this->m_usn)");
DEBUG_SSDP.println(sizeof(this->m_usn)); //DEBUG_SSDP.println(sizeof(this->m_usn));
memset(this->m_usn, 0x00, sizeof(this->m_usn)); //#endif
#endif if(strncmp("upnp:rootdevice", st, strlen(st)) == 0) {
if(strncmp("upnp:root", st, strlen(st)) == 0) {
snprintf_P(this->m_usn, sizeof(this->m_usn) - 1, _ssdp_usn_root_template, this->uuid); snprintf_P(this->m_usn, sizeof(this->m_usn) - 1, _ssdp_usn_root_template, this->uuid);
} }
else if(strncmp("uuid:", st, 5) == 0)
snprintf_P(this->m_usn, sizeof(this->m_usn) - 1, _ssdp_usn_uuid_template, this->uuid);
else if(strncmp("urn:", st, 4) == 0)
snprintf_P(this->m_usn, sizeof(this->m_usn) -1, _ssdp_usn_urn_template, this->uuid, this->deviceType);
else { else {
snprintf_P(this->m_usn, sizeof(this->m_usn) - 1, _ssdp_usn_uuid_template, this->uuid, st); snprintf_P(this->m_usn, sizeof(this->m_usn) - 1, _ssdp_usn_uuid_template, this->uuid);
} }
#ifdef DEBUG_SSDP //#ifdef DEBUG_SSDP
DEBUG_SSDP.print("RESUSN UUID: "); //DEBUG_SSDP.print("RESUSN UUID: ");
DEBUG_SSDP.println(this->m_usn); //DEBUG_SSDP.println(this->m_usn);
#endif //#endif
return this->m_usn; return this->m_usn;
} }
void UPNPDeviceType::setChipId(uint32_t chipId) { void UPNPDeviceType::setChipId(uint32_t chipId) {
@ -139,7 +148,7 @@ bool SSDPClass::begin() {
for(int i = 0; i < SSDP_QUEUE_SIZE; i++) { for(int i = 0; i < SSDP_QUEUE_SIZE; i++) {
this->sendQueue[i].waiting = false; this->sendQueue[i].waiting = false;
} }
this->end(); if(this->_server.connected()) this->end();
//assert(NULL == _server); //assert(NULL == _server);
if(_server.connected()) { if(_server.connected()) {
#ifdef DEBUG_SSDP #ifdef DEBUG_SSDP
@ -152,29 +161,37 @@ bool SSDPClass::begin() {
if(!_server.listenMulticast(IPAddress(SSDP_MULTICAST_ADDR), SSDP_PORT)) { if(!_server.listenMulticast(IPAddress(SSDP_MULTICAST_ADDR), SSDP_PORT)) {
#ifdef DEBUG_SSDP #ifdef DEBUG_SSDP
IPAddress mcast(SSDP_MULTICAST_ADDR); IPAddress mcast(SSDP_MULTICAST_ADDR);
DEBUG_SSDP.println(PSTR("Error starting SSDP listener on:")); DEBUG_SSDP.println(PSTR("Error starting SSDP listener on: "));
DEBUG_SSDP.print(mcast); DEBUG_SSDP.print(mcast);
DEBUG_SSDP.print(":"); DEBUG_SSDP.print(":");
DEBUG_SSDP.println(SSDP_PORT); DEBUG_SSDP.println(SSDP_PORT);
#endif #endif
return false; return false;
} }
for(uint8_t i = 0; i < this->m_cdeviceTypes; i++) {
Serial.printf("SSDP: %s - %s\n", this->deviceTypes[i].deviceType, this->deviceTypes[i].isActive ? "true" : "false");
}
this->isStarted = true; this->isStarted = true;
this->_sendByeBye(); this->_sendByeBye();
this->_sendNotify(); this->_sendNotify();
Serial.println("Connected to SSDP"); Serial.println("Connected to SSDP...");
return true; return true;
} }
void SSDPClass::end() { void SSDPClass::end() {
if(!this->_server || !this->_server.connected()) return; // server isn't connected nothing to do if(!this->_server || !this->_server.connected()) return; // server isn't connected nothing to do
#ifdef DEBUG_SSDP #ifdef DEBUG_SSDP
DEBUG_SSDP.printf(PSTR("SSDP end ... ")); DEBUG_SSDP.printf(PSTR("SSDP end ...\n "));
#endif #endif
this->_sendByeBye(); this->_sendByeBye();
//this->_stopTimer();
this->_server.close(); this->_server.close();
this->isStarted = false; this->isStarted = false;
Serial.println("Disconnected from SSDP"); // Clear out the last notified so if the user starts us up again it will notify
// that we exist again.
for(uint8_t i = 0; i < this->m_cdeviceTypes; i++) {
this->deviceTypes[i].lastNotified = 0;
}
Serial.println("Disconnected from SSDP...");
} }
UPNPDeviceType* SSDPClass::getDeviceType(uint8_t ndx) { if(ndx < this->m_cdeviceTypes) return &this->deviceTypes[ndx]; return nullptr; } UPNPDeviceType* SSDPClass::getDeviceType(uint8_t ndx) { if(ndx < this->m_cdeviceTypes) return &this->deviceTypes[ndx]; return nullptr; }
UPNPDeviceType* SSDPClass::findDeviceByType(char *devType) { UPNPDeviceType* SSDPClass::findDeviceByType(char *devType) {
@ -242,9 +259,6 @@ void SSDPClass::_parsePacket(ssdp_packet_t *pkt, AsyncUDPPacket &p) {
buffer[0] = '\0'; buffer[0] = '\0';
while(p.available() > 0) { while(p.available() > 0) {
char c = p.read(); char c = p.read();
//#ifdef DEBUG_SSDP_PACKET
//DEBUG_SSDP.print(c);
//#endif
if(keys == KEY) { if(keys == KEY) {
if(c == ':') { if(c == ':') {
_trim(buffer); _trim(buffer);
@ -259,12 +273,8 @@ void SSDPClass::_parsePacket(ssdp_packet_t *pkt, AsyncUDPPacket &p) {
else if(strcasecmp(buffer, "LOCATION") == 0) keys = LOCATION; else if(strcasecmp(buffer, "LOCATION") == 0) keys = LOCATION;
else if(strcasecmp(buffer, "USN") == 0) keys = USN; else if(strcasecmp(buffer, "USN") == 0) keys = USN;
else keys = HEAD; else keys = HEAD;
//#ifdef DEBUG_SSDP_PACKET
//DEBUG_SSDP.printf("Found a key: %s ", buffer);
//#endif
pos = 0; pos = 0;
buffer[0] = '\0'; buffer[0] = '\0';
} }
else if(c == '\r' || c == '\n') { else if(c == '\r' || c == '\n') {
// If we find a key that ends before a : then we need to bugger out. // If we find a key that ends before a : then we need to bugger out.
@ -284,9 +294,6 @@ void SSDPClass::_parsePacket(ssdp_packet_t *pkt, AsyncUDPPacket &p) {
// We are reading a value // We are reading a value
if(c == '\r' || c == '\n') { if(c == '\r' || c == '\n') {
_trim(buffer); _trim(buffer);
#ifdef DEBUG_SSDP_PACKET
DEBUG_SSDP.println(buffer);
#endif
switch(keys) { switch(keys) {
case HOST: case HOST:
if(strcasecmp(buffer, "239.255.255.250:1900") == 0) pkt->type = MULTICAST; if(strcasecmp(buffer, "239.255.255.250:1900") == 0) pkt->type = MULTICAST;
@ -324,9 +331,6 @@ void SSDPClass::_parsePacket(ssdp_packet_t *pkt, AsyncUDPPacket &p) {
if(pkt->valid) { if(pkt->valid) {
if(pkt->method == NONE) pkt->valid = false; if(pkt->method == NONE) pkt->valid = false;
if(pkt->method == SEARCH) { if(pkt->method == SEARCH) {
#ifdef DEBUG_SSDP_PACKET
//this->_printPacket(pkt);
#endif
if(strcmp(pkt->man, "ssdp:discover") != 0) pkt->valid = false; if(strcmp(pkt->man, "ssdp:discover") != 0) pkt->valid = false;
if(strlen(pkt->st) == 0) pkt->valid = false; if(strlen(pkt->st) == 0) pkt->valid = false;
else if(strcmp(pkt->st, "ssdp:all") != 0 && else if(strcmp(pkt->st, "ssdp:all") != 0 &&
@ -367,8 +371,6 @@ IPAddress SSDPClass::localIP()
void SSDPClass::_sendResponse(IPAddress addr, uint16_t port, UPNPDeviceType *d, char *st, bool sendUUID) { void SSDPClass::_sendResponse(IPAddress addr, uint16_t port, UPNPDeviceType *d, char *st, bool sendUUID) {
char buffer[1460]; char buffer[1460];
IPAddress ip = this->localIP(); IPAddress ip = this->localIP();
//IPAddress ip = WiFi.localIP();
char *pbuff = (char *)malloc(strlen_P(_ssdp_response_template)+1); char *pbuff = (char *)malloc(strlen_P(_ssdp_response_template)+1);
if(!pbuff) { if(!pbuff) {
#ifdef DEBUG_SSDP #ifdef DEBUG_SSDP
@ -380,7 +382,6 @@ void SSDPClass::_sendResponse(IPAddress addr, uint16_t port, UPNPDeviceType *d,
#ifdef DEBUG_SSDP #ifdef DEBUG_SSDP
//3FFC40B8 //3FFC40B8
DEBUG_SSDP.println("Before sprintf ");
DEBUG_SSDP.print("CACHE-CONTROL: max-age="); DEBUG_SSDP.print("CACHE-CONTROL: max-age=");
DEBUG_SSDP.println(this->_interval); DEBUG_SSDP.println(this->_interval);
DEBUG_SSDP.print("SERVER: Arduino/1.0 UPNP/1.1 "); DEBUG_SSDP.print("SERVER: Arduino/1.0 UPNP/1.1 ");
@ -391,13 +392,13 @@ void SSDPClass::_sendResponse(IPAddress addr, uint16_t port, UPNPDeviceType *d,
DEBUG_SSDP.println(d->getUSN(st)); DEBUG_SSDP.println(d->getUSN(st));
DEBUG_SSDP.print("ST: "); DEBUG_SSDP.print("ST: ");
DEBUG_SSDP.println((sendUUID) ? d->uuid : st); DEBUG_SSDP.println((sendUUID) ? d->uuid : st);
DEBUG_SSDP.print("LOCATION: http://"); DEBUG_SSDP.printf("LOCATION: http://%d.%d.%d.%d:%d/", ip[0], ip[1], ip[2], ip[3], this->_port);
DEBUG_SSDP.print(ip[0]); //DEBUG_SSDP.print(ip[0]);
DEBUG_SSDP.print(ip[1]); //DEBUG_SSDP.print(ip[1]);
DEBUG_SSDP.print(ip[2]); //DEBUG_SSDP.print(ip[2]);
DEBUG_SSDP.print(ip[3]); //DEBUG_SSDP.print(ip[3]);
DEBUG_SSDP.print(":"); //DEBUG_SSDP.print(":");
DEBUG_SSDP.print(this->_port); //DEBUG_SSDP.print(this->_port);
DEBUG_SSDP.println(d->schemaURL); DEBUG_SSDP.println(d->schemaURL);
#endif #endif
// Don't use ip.toString as this fragments the heap like no tomorrow. // Don't use ip.toString as this fragments the heap like no tomorrow.
@ -438,8 +439,11 @@ static const char _ssdp_packet_template[] PROGMEM =
_server.writeTo((const uint8_t *)buffer, len, addr, port); _server.writeTo((const uint8_t *)buffer, len, addr, port);
} }
void SSDPClass::_sendNotify() { void SSDPClass::_sendNotify() {
//Serial.printf("sendNotify %d\n", this->m_cdeviceTypes);
//if(!this->_server.connected()) return;
for(uint8_t i = 0; i < this->m_cdeviceTypes; i++) { for(uint8_t i = 0; i < this->m_cdeviceTypes; i++) {
UPNPDeviceType *dev = &this->deviceTypes[i]; UPNPDeviceType *dev = &this->deviceTypes[i];
if(i == 0 && (strlen(dev->deviceType) == 0 || !dev->isActive)) Serial.printf("The device type is empty: %s\n", dev->isActive ? "true" : "false");
if(strlen(dev->deviceType) > 0 && dev->isActive) { if(strlen(dev->deviceType) > 0 && dev->isActive) {
uint16_t elapsed = (millis() - dev->lastNotified); uint16_t elapsed = (millis() - dev->lastNotified);
if(!dev->lastNotified || (elapsed * 4) > (this->_interval * 1000)) { if(!dev->lastNotified || (elapsed * 4) > (this->_interval * 1000)) {
@ -453,6 +457,7 @@ void SSDPClass::_sendNotify() {
#endif #endif
this->_sendNotify(dev, i == 0); this->_sendNotify(dev, i == 0);
} }
/*
else { else {
#ifdef DEBUG_SSDP #ifdef DEBUG_SSDP
DEBUG_SSDP.print(dev->deviceType); DEBUG_SSDP.print(dev->deviceType);
@ -463,15 +468,20 @@ void SSDPClass::_sendNotify() {
DEBUG_SSDP.println("msec -- SKIPPING"); DEBUG_SSDP.println("msec -- SKIPPING");
#endif #endif
} }
*/
} }
} }
} }
void SSDPClass::_sendNotify(const char *msg) { void SSDPClass::_sendNotify(const char *msg) {
//_server->append(msg, strlen(msg)); //_server->append(msg, strlen(msg));
//_server->send(IPAddress(SSDP_MULTICAST_ADDR), SSDP_PORT); //_server->send(IPAddress(SSDP_MULTICAST_ADDR), SSDP_PORT);
#ifdef DEBUG_SSDP
DEBUG_SSDP.println("--------------- SEND NOTIFY PACKET ----------------");
DEBUG_SSDP.println(msg);
#endif
_server.writeTo((uint8_t *)msg, strlen(msg), IPAddress(SSDP_MULTICAST_ADDR), SSDP_PORT); _server.writeTo((uint8_t *)msg, strlen(msg), IPAddress(SSDP_MULTICAST_ADDR), SSDP_PORT);
} }
void SSDPClass::_sendNotify(UPNPDeviceType *d) { this->_sendByeBye(d, strcmp(d->deviceType, this->deviceTypes[0].deviceType) == 0); } void SSDPClass::_sendNotify(UPNPDeviceType *d) { this->_sendNotify(d, strcmp(d->deviceType, this->deviceTypes[0].deviceType) == 0); }
void SSDPClass::_sendNotify(UPNPDeviceType *d, bool root) { void SSDPClass::_sendNotify(UPNPDeviceType *d, bool root) {
char buffer[1460]; char buffer[1460];
IPAddress ip = this->localIP(); IPAddress ip = this->localIP();
@ -492,15 +502,7 @@ void SSDPClass::_sendNotify(UPNPDeviceType *d, bool root) {
#endif #endif
return; return;
} }
strcpy_P(pbuff, _ssdp_response_template); strcpy_P(pbuff, _ssdp_notify_template);
#ifdef DEBUG_SSDP
//3FFC40B8
DEBUG_SSDP.print("Before Notify sprintf ");
DEBUG_SSDP.print((uintptr_t)d, HEX);
DEBUG_SSDP.println(" ");
#endif
if(root) { if(root) {
// Send 1 for root // Send 1 for root
snprintf_P(buffer, sizeof(buffer), snprintf_P(buffer, sizeof(buffer),
@ -513,39 +515,40 @@ void SSDPClass::_sendNotify(UPNPDeviceType *d, bool root) {
ip[0], ip[1], ip[2], ip[3], this->_port, d->schemaURL); ip[0], ip[1], ip[2], ip[3], this->_port, d->schemaURL);
this->_sendNotify(buffer); this->_sendNotify(buffer);
} }
else { // Send 1 for uuid
// Send 1 for uuid snprintf_P(buffer, sizeof(buffer),
snprintf_P(buffer, sizeof(buffer), _ssdp_packet_template,
_ssdp_packet_template, pbuff,
pbuff, this->_interval,
this->_interval, d->modelName,
d->modelName, d->modelNumber,
d->modelNumber, d->getUSN(d->uuid),
d->uuid, "NT", d->uuid,
"NT", d->uuid, ip[0], ip[1], ip[2], ip[3], _port, d->schemaURL);
ip[0], ip[1], ip[2], ip[3], _port, d->schemaURL); this->_sendNotify(buffer);
this->_sendNotify(buffer); // Send 1 for deviceType
// Send 1 for deviceType snprintf_P(buffer, sizeof(buffer),
snprintf_P(buffer, sizeof(buffer), _ssdp_packet_template,
_ssdp_packet_template, pbuff,
pbuff, this->_interval,
this->_interval, d->modelName,
d->modelName, d->modelNumber,
d->modelNumber, d->getUSN(d->deviceType),
d->getUSN(d->deviceType), "NT", d->deviceType,
"NT", d->deviceType, ip[0], ip[1], ip[2], ip[3], _port, d->schemaURL);
ip[0], ip[1], ip[2], ip[3], _port, d->schemaURL); this->_sendNotify(buffer);
this->_sendNotify(buffer);
}
d->lastNotified = millis(); d->lastNotified = millis();
} }
void SSDPClass::setActive(uint8_t ndx, bool isActive) { void SSDPClass::setActive(uint8_t ndx, bool isActive) {
UPNPDeviceType *d = &this->deviceTypes[ndx]; UPNPDeviceType *d = &this->deviceTypes[ndx];
if(!isActive) this->_sendByeBye(d, ndx == 0); if(!isActive) {
if(this->isStarted) this->_sendByeBye(d, ndx == 0);
d->isActive = false;
}
else { else {
d->isActive = true; d->isActive = true;
d->lastNotified = 0; d->lastNotified = 0;
this->_sendNotify(d, ndx == 0); if(this->isStarted) this->_sendNotify(d, ndx == 0);
} }
} }
void SSDPClass::_sendByeBye() { void SSDPClass::_sendByeBye() {
@ -554,11 +557,9 @@ void SSDPClass::_sendByeBye() {
if(strlen(dev->deviceType) > 0) { if(strlen(dev->deviceType) > 0) {
#ifdef DEBUG_SSDP #ifdef DEBUG_SSDP
DEBUG_SSDP.print(dev->deviceType); DEBUG_SSDP.print(dev->deviceType);
//DEBUG_SSDP.print(" Time since last notified: "); DEBUG_SSDP.print(" ");
//DEBUG_SSDP.print(elapsed);
//DEBUG_SSDP.print("msec ");
DEBUG_SSDP.print(this->_interval); DEBUG_SSDP.print(this->_interval);
DEBUG_SSDP.println("msec"); DEBUG_SSDP.println("sec");
#endif #endif
this->_sendByeBye(dev, i == 0); this->_sendByeBye(dev, i == 0);
} }
@ -586,40 +587,22 @@ void SSDPClass::_sendByeBye(UPNPDeviceType *d, bool root) {
if(root) { if(root) {
// Send 1 for root // Send 1 for root
snprintf_P(buffer, sizeof(buffer)-1, snprintf_P(buffer, sizeof(buffer)-1,
_ssdp_packet_template, _ssdp_bye_template,
_ssdp_notify_template, "upnp:rootdevice", d->getUSN("upnp:rootdevice"));
this->_interval,
d->modelName, d->modelNumber,
d->getUSN("upnp:rootdevice"), // USN
"NT", "upnp:rootdevice",
ip[0], ip[1], ip[2], ip[3], this->_port, d->schemaURL);
this->_sendNotify(buffer); this->_sendNotify(buffer);
} }
else { // Send 1 for uuid
// Send 1 for uuid snprintf_P(buffer, sizeof(buffer)-1,
snprintf_P(buffer, sizeof(buffer)-1, _ssdp_bye_template,
_ssdp_packet_template, d->getUSN(d->uuid),
_ssdp_notify_template, d->getUSN(d->uuid));
this->_interval, this->_sendNotify(buffer);
d->modelName, // Send 1 for deviceType
d->modelNumber, snprintf_P(buffer, sizeof(buffer)-1,
d->uuid, _ssdp_bye_template,
"NT", d->uuid, d->deviceType,
ip[0], ip[1], ip[2], ip[3], this->_port, d->schemaURL); d->getUSN(d->deviceType));
this->_sendNotify(buffer); this->_sendNotify(buffer);
// Send 1 for deviceType
snprintf_P(buffer, sizeof(buffer)-1,
_ssdp_packet_template,
_ssdp_notify_template,
this->_interval,
d->modelName,
d->modelNumber,
d->getUSN(d->deviceType),
"NT", d->deviceType,
ip[0], ip[1], ip[2], ip[3], this->_port, d->schemaURL);
this->_sendNotify(buffer);
}
d->isActive = false;
} }
void SSDPClass::_addToSendQueue(IPAddress addr, uint16_t port, UPNPDeviceType *d, char *st, uint8_t sec, bool sendUUID) { void SSDPClass::_addToSendQueue(IPAddress addr, uint16_t port, UPNPDeviceType *d, char *st, uint8_t sec, bool sendUUID) {
/* /*
@ -638,7 +621,7 @@ void SSDPClass::_addToSendQueue(IPAddress addr, uint16_t port, UPNPDeviceType *d
ssdp_response_t *q = &this->sendQueue[i]; ssdp_response_t *q = &this->sendQueue[i];
if(q->address == addr && q->port == port && q->sendUUID == sendUUID) { if(q->address == addr && q->port == port && q->sendUUID == sendUUID) {
#ifdef DEBUG_SSDP #ifdef DEBUG_SSDP
DEBUG_SSDP.printf("There is already a response to this query in slot #u\n", i); DEBUG_SSDP.printf("There is already a response to this query in slot %u\n", i);
#endif #endif
return; return;
} }
@ -655,7 +638,7 @@ void SSDPClass::_addToSendQueue(IPAddress addr, uint16_t port, UPNPDeviceType *d
q->dev = d; q->dev = d;
q->sendTime = millis() + (random(0, sec - 1) * 1000L); q->sendTime = millis() + (random(0, sec - 1) * 1000L);
q->address = addr; q->address = addr;
q->port = _port; q->port = port;
q->sendUUID = sendUUID; q->sendUUID = sendUUID;
strlcpy(q->st, st, sizeof(ssdp_response_t::st)-1); strlcpy(q->st, st, sizeof(ssdp_response_t::st)-1);
q->waiting = true; q->waiting = true;
@ -710,6 +693,7 @@ void SSDPClass::_printPacket(ssdp_packet_t *pkt) {
} }
void SSDPClass::_processRequest(AsyncUDPPacket &p) { void SSDPClass::_processRequest(AsyncUDPPacket &p) {
// This pending BS should probably be for unicast request only but we will play along for now. // This pending BS should probably be for unicast request only but we will play along for now.
if(!this->_server.connected()) return;
if(p.length() == 0) { if(p.length() == 0) {
//this->_sendQueuedResponses(); //this->_sendQueuedResponses();
return; return;
@ -719,16 +703,20 @@ void SSDPClass::_processRequest(AsyncUDPPacket &p) {
if(pkt.valid && pkt.method == SEARCH) { if(pkt.valid && pkt.method == SEARCH) {
// Check to see if we have anything to respond to from this packet. // Check to see if we have anything to respond to from this packet.
if(strcmp("ssdp:all", pkt.st) == 0) { if(strcmp("ssdp:all", pkt.st) == 0) {
#ifdef DEBUG_SSDP
DEBUG_SSDP.println("--------------- ALL ---------------------");
this->_printPacket(&pkt);
#endif
for(uint8_t i = 0; i < this->m_cdeviceTypes; i++) { for(uint8_t i = 0; i < this->m_cdeviceTypes; i++) {
if(strlen(this->deviceTypes[i].deviceType) > 0) if(strlen(this->deviceTypes[i].deviceType) > 0)
this->_addToSendQueue(p.remoteIP(), p.remotePort(), &this->deviceTypes[i], this->deviceTypes[i].deviceType, pkt.mx, false); this->_addToSendQueue(p.remoteIP(), p.remotePort(), &this->deviceTypes[i], pkt.st, pkt.mx, false);
} }
} }
else if(strcmp("upnp:rootdevice", pkt.st) == 0) { else if(strcmp("upnp:rootdevice", pkt.st) == 0) {
UPNPDeviceType *dev = &this->deviceTypes[0]; UPNPDeviceType *dev = &this->deviceTypes[0];
#ifdef DEBUG_SSDP #ifdef DEBUG_SSDP
this->_printPacket(&pkt);
DEBUG_SSDP.println("--------------- ROOT ---------------------"); DEBUG_SSDP.println("--------------- ROOT ---------------------");
this->_printPacket(&pkt);
#endif #endif
if(pkt.type == MULTICAST) if(pkt.type == MULTICAST)
this->_addToSendQueue(IPAddress(SSDP_MULTICAST_ADDR), SSDP_PORT, dev, pkt.st, pkt.mx, false); this->_addToSendQueue(IPAddress(SSDP_MULTICAST_ADDR), SSDP_PORT, dev, pkt.st, pkt.mx, false);
@ -761,6 +749,8 @@ void SSDPClass::_processRequest(AsyncUDPPacket &p) {
} }
void SSDPClass::loop() { void SSDPClass::loop() {
this->_sendQueuedResponses(); this->_sendQueuedResponses();
// We need to send the notify if required.
this->_sendNotify();
} }
void SSDPClass::schema(Print &client) { void SSDPClass::schema(Print &client) {
IPAddress ip = this->localIP(); IPAddress ip = this->localIP();
@ -812,7 +802,7 @@ void SSDPClass::schema(Print &client) {
} }
client.print(F("</deviceList></device></root>\r\n")); client.print(F("</deviceList></device></root>\r\n"));
#ifdef DEBUG_SSDP #ifdef DEBUG_SSDP
DEBUG_SSDP.println("Sending Device.xml"); DEBUG_SSDP.println("Sending upnp.xml");
#endif #endif
} }
/* /*
@ -836,7 +826,7 @@ void SSDPClass::setSchemaURL(uint8_t ndx, const char *url) { this->deviceTypes[
void SSDPClass::setUUID(uint8_t ndx, const char *uuid) { this->deviceTypes[ndx].setUUID(uuid); } void SSDPClass::setUUID(uint8_t ndx, const char *uuid) { this->deviceTypes[ndx].setUUID(uuid); }
void SSDPClass::setUUID(uint8_t ndx, const char *prefix, uint32_t id) { void SSDPClass::setUUID(uint8_t ndx, const char *prefix, uint32_t id) {
char svcuuid[50]; char svcuuid[50];
sprintf(svcuuid, "%s%02x%02x%02x", sprintf(svcuuid, "%s%02X%02X%02X",
prefix, prefix,
(uint16_t)((id >> 16) & 0xff), (uint16_t)((id >> 16) & 0xff),
(uint16_t)((id >> 8) & 0xff), (uint16_t)((id >> 8) & 0xff),

5
SSDP.h
View file

@ -7,14 +7,15 @@
#define SSDP_UUID_SIZE 42 #define SSDP_UUID_SIZE 42
#define SSDP_SCHEMA_URL_SIZE 64 #define SSDP_SCHEMA_URL_SIZE 64
#define SSDP_DEVICE_TYPE_SIZE 64 #define SSDP_DEVICE_TYPE_SIZE 64
#define SSDP_FRIENDLY_NAME_SIZE 64
#define SSDP_SERIAL_NUMBER_SIZE 37 #define SSDP_SERIAL_NUMBER_SIZE 37
#define SSDP_PRESENTATION_URL_SIZE 64 #define SSDP_PRESENTATION_URL_SIZE 64
#define SSDP_MODEL_NAME_SIZE 64 #define SSDP_MODEL_NAME_SIZE 64
#define SSDP_MODEL_URL_SIZE 64 #define SSDP_MODEL_URL_SIZE 64
#define SSDP_MODEL_VERSION_SIZE 32 #define SSDP_MODEL_VERSION_SIZE 32
#define SSDP_MANUFACTURER_SIZE 64 #define SSDP_MANUFACTURER_SIZE 64
#define SSDP_USN_SIZE 128
#define SSDP_MANUFACTURER_URL_SIZE 64 #define SSDP_MANUFACTURER_URL_SIZE 64
#define SSDP_FRIENDLY_NAME_SIZE 64
#define SSDP_INTERVAL_SECONDS 1800 #define SSDP_INTERVAL_SECONDS 1800
#define SSDP_MULTICAST_TTL 2 #define SSDP_MULTICAST_TTL 2
#define SSDP_HTTP_PORT 80 #define SSDP_HTTP_PORT 80
@ -53,7 +54,7 @@ struct ssdp_packet_t {
}; };
class UPNPDeviceType { class UPNPDeviceType {
char m_usn[SSDP_MANUFACTURER_URL_SIZE]; char m_usn[SSDP_USN_SIZE];
public: public:
UPNPDeviceType(); UPNPDeviceType();
UPNPDeviceType(const char *deviceType); UPNPDeviceType(const char *deviceType);

BIN
SomfyController.ino.esp32.bin
View file

Binary file not shown.

BIN
SomfyController.ino.esp32s3.bin
View file

Binary file not shown.

BIN
SomfyController.littlefs.bin
View file

Binary file not shown.

2
data/index.html
View file

@ -830,7 +830,7 @@
</div> </div>
<div id="divHomePnl" style="position:relative;"> <div id="divHomePnl" style="position:relative;">
<hr /> <hr />
<div id="divRoomSelector" class="room-selector" data-roomid="0" onclick="event.stopPropagation(); somfy.openSelectRoom();"> <div id="divRoomSelector" class="room-selector" style="display:none;" data-roomid="0" onclick="event.stopPropagation(); somfy.openSelectRoom();">
<i class="icss-bars"></i><span>Home</span> <i class="icss-bars"></i><span>Home</span>
<div id="divRoomSelector-list" class="room-selector-list"></div> <div id="divRoomSelector-list" class="room-selector-list"></div>
</div> </div>

3
data/index.js
View file

@ -2181,8 +2181,7 @@ class Somfy {
_rooms.push(room); _rooms.push(room);
divCtl += `<div class='room-row' data-roomid="${room.roomId}" onclick="somfy.selectRoom(${room.roomId});event.stopPropagation();">${room.name}</div>`; divCtl += `<div class='room-row' data-roomid="${room.roomId}" onclick="somfy.selectRoom(${room.roomId});event.stopPropagation();">${room.name}</div>`;
} }
if (rooms.length === 0) document.getElementById('divRoomSelector').style.display = 'none'; document.getElementById('divRoomSelector').style.display = rooms.length === 0 ? 'none' : '';
else document.getElementById('divRoomSelector').style.display = '';
document.getElementById('divRoomSelector-list').innerHTML = divCtl; document.getElementById('divRoomSelector-list').innerHTML = divCtl;
document.getElementById('divRoomList').innerHTML = divCfg; document.getElementById('divRoomList').innerHTML = divCfg;
document.getElementById('selShadeRoom').innerHTML = divOpts; document.getElementById('selShadeRoom').innerHTML = divOpts;