arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-12 01:53:07 +03:00
Code Activity

Allman now (#6080)

Browse Source 
* switch restyle script for CI

* remove confirmation

* restyle with allman
This commit is contained in:
Allman-astyler
2019-05-13 16:41:34 +02:00
committed by david gauchard
parent 625c3a62c4
commit 98125f8860
255 changed files with 51238 additions and 42984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
libraries/ESP8266LLMNR/ESP8266LLMNR.cpp
View File

@ -1,39 +1,39 @@
/*
* ESP8266 LLMNR responder
* Copyright (C) 2017 Stephen Warren <swarren@wwwdotorg.org>
*
* Based on:
* ESP8266 Multicast DNS (port of CC3000 Multicast DNS library)
* Version 1.1
* Copyright (c) 2013 Tony DiCola (tony@tonydicola.com)
* ESP8266 port (c) 2015 Ivan Grokhotkov (ivan@esp8266.com)
* MDNS-SD Suport 2015 Hristo Gochkov
* Extended MDNS-SD support 2016 Lars Englund (lars.englund@gmail.com)
*
* License (MIT license):
*
* 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.
*
* Reference:
* https://tools.ietf.org/html/rfc4795 (LLMNR)
* https://tools.ietf.org/html/rfc1035 (DNS)
*/
ESP8266 LLMNR responder
Copyright (C) 2017 Stephen Warren <swarren@wwwdotorg.org>
Based on:
ESP8266 Multicast DNS (port of CC3000 Multicast DNS library)
Version 1.1
Copyright (c) 2013 Tony DiCola (tony@tonydicola.com)
ESP8266 port (c) 2015 Ivan Grokhotkov (ivan@esp8266.com)
MDNS-SD Suport 2015 Hristo Gochkov
Extended MDNS-SD support 2016 Lars Englund (lars.englund@gmail.com)
License (MIT license):
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.
Reference:
https://tools.ietf.org/html/rfc4795 (LLMNR)
https://tools.ietf.org/html/rfc1035 (DNS)
*/
#include <debug.h>
#include <functional>
@ -72,28 +72,37 @@ static const int LLMNR_MULTICAST_TTL = 1;
static const int LLMNR_PORT = 5355;
LLMNRResponder::LLMNRResponder() :
_conn(0) {
_conn(0)
{
}
LLMNRResponder::~LLMNRResponder() {
LLMNRResponder::~LLMNRResponder()
{
if (_conn)
{
_conn->unref();
}
}
bool LLMNRResponder::begin(const char* hostname) {
bool LLMNRResponder::begin(const char* hostname)
{
// Max length for a single label in DNS
if (strlen(hostname) > 63)
{
return false;
}
_hostname = hostname;
_hostname.toLowerCase();
_sta_got_ip_handler = WiFi.onStationModeGotIP([this](const WiFiEventStationModeGotIP& event){
_sta_got_ip_handler = WiFi.onStationModeGotIP([this](const WiFiEventStationModeGotIP & event)
{
(void) event;
_restart();
});
_sta_disconnected_handler = WiFi.onStationModeDisconnected([this](const WiFiEventStationModeDisconnected& event) {
_sta_disconnected_handler = WiFi.onStationModeDisconnected([this](const WiFiEventStationModeDisconnected & event)
{
(void) event;
_restart();
});
@ -101,12 +110,15 @@ bool LLMNRResponder::begin(const char* hostname) {
return _restart();
}
void LLMNRResponder::notify_ap_change() {
void LLMNRResponder::notify_ap_change()
{
_restart();
}
bool LLMNRResponder::_restart() {
if (_conn) {
bool LLMNRResponder::_restart()
{
if (_conn)
{
_conn->unref();
_conn = 0;
}
@ -114,13 +126,17 @@ bool LLMNRResponder::_restart() {
IPAddress llmnr(LLMNR_MULTICAST_ADDR);
if (igmp_joingroup(IP4_ADDR_ANY4, llmnr) != ERR_OK)
{
return false;
}
_conn = new UdpContext;
_conn->ref();
if (!_conn->listen(IP_ADDR_ANY, LLMNR_PORT))
{
return false;
}
_conn->setMulticastTTL(LLMNR_MULTICAST_TTL);
_conn->onRx(std::bind(&LLMNRResponder::_process_packet, this));
@ -128,9 +144,12 @@ bool LLMNRResponder::_restart() {
return true;
}
void LLMNRResponder::_process_packet() {
void LLMNRResponder::_process_packet()
{
if (!_conn || !_conn->next())
{
return;
}
#ifdef LLMNR_DEBUG
Serial.println("LLMNR: RX'd packet");
@ -159,21 +178,24 @@ void LLMNRResponder::_process_packet() {
#endif
#define BAD_FLAGS (FLAGS_QR | (FLAGS_OP_MASK << FLAGS_OP_SHIFT) | FLAGS_C)
if (flags & BAD_FLAGS) {
if (flags & BAD_FLAGS)
{
#ifdef LLMNR_DEBUG
Serial.println("Bad flags");
#endif
return;
}
if (qdcount != 1) {
if (qdcount != 1)
{
#ifdef LLMNR_DEBUG
Serial.println("QDCOUNT != 1");
#endif
return;
}
if (ancount || nscount || arcount) {
if (ancount || nscount || arcount)
{
#ifdef LLMNR_DEBUG
Serial.println("AN/NS/AR-COUNT != 0");
#endif
@ -185,7 +207,8 @@ void LLMNRResponder::_process_packet() {
Serial.print("QNAME len ");
Serial.println(namelen);
#endif
if (namelen != _hostname.length()) {
if (namelen != _hostname.length())
{
#ifdef LLMNR_DEBUG
Serial.println("QNAME len mismatch");
#endif
@ -201,7 +224,8 @@ void LLMNRResponder::_process_packet() {
Serial.println(qname);
#endif
if (strcmp(_hostname.c_str(), qname)) {
if (strcmp(_hostname.c_str(), qname))
{
#ifdef LLMNR_DEBUG
Serial.println("QNAME mismatch");
#endif
@ -227,26 +251,34 @@ void LLMNRResponder::_process_packet() {
#ifdef LLMNR_DEBUG
Serial.println("Match; responding");
if (!have_rr)
{
Serial.println("(no matching RRs)");
}
#endif
IPAddress remote_ip = _conn->getRemoteAddress();
struct ip_info ip_info;
bool match_ap = false;
if (wifi_get_opmode() & SOFTAP_MODE) {
if (wifi_get_opmode() & SOFTAP_MODE)
{
wifi_get_ip_info(SOFTAP_IF, &ip_info);
IPAddress infoIp(ip_info.ip);
IPAddress infoMask(ip_info.netmask);
if (ip_info.ip.addr && ip_addr_netcmp((const ip_addr_t*)remote_ip, (const ip_addr_t*)infoIp, ip_2_ip4((const ip_addr_t*)infoMask)))
{
match_ap = true;
}
}
if (!match_ap)
{
wifi_get_ip_info(STATION_IF, &ip_info);
}
uint32_t ip = ip_info.ip.addr;
// Header
uint8_t header[] = {
uint8_t header[] =
{
(uint8_t)(id >> 8), (uint8_t)(id & 0xff), // ID
(uint8_t)(FLAGS_QR >> 8), 0, // FLAGS
0, 1, // QDCOUNT
@ -258,17 +290,20 @@ void LLMNRResponder::_process_packet() {
// Question
_conn->append(reinterpret_cast<const char*>(&namelen), 1);
_conn->append(qname, namelen);
uint8_t q[] = {
uint8_t q[] =
{
0, // Name terminator
0, 1, // TYPE (A)
0, 1, // CLASS (IN)
};
_conn->append(reinterpret_cast<const char*>(q), sizeof(q));
// Answer, if we have one
if (have_rr) {
if (have_rr)
{
_conn->append(reinterpret_cast<const char*>(&namelen), 1);
_conn->append(qname, namelen);
uint8_t rr[] = {
uint8_t rr[] =
{
0, // Name terminator
0, 1, // TYPE (A)
0, 1, // CLASS (IN)