Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
e67c6f09
Commit
e67c6f09
authored
Oct 06, 2016
by
Johny Mattsson
Browse files
Split out IP formatting helpers.
parent
423cb645
Changes
5
Hide whitespace changes
Inline
Side-by-side
components/base_nodemcu/include/ip_fmt.h
0 → 100644
View file @
e67c6f09
/*
* Copyright 2016 Dius Computing Pty Ltd. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the
* distribution.
* - Neither the name of the copyright holders nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* @author Johny Mattsson <jmattsson@dius.com.au>
*/
#ifndef _IP_FMT_H_
#define _IP_FMT_H_
#include <stdint.h>
#include "lwip/ip_addr.h"
// String buffer for a formatted MAC/BSSID
#define MAC_STR_SZ (6*2+5+1)
void
macstr
(
char
*
out
,
const
uint8_t
*
mac
);
// String buffer for a formatted IPv4 or IPv6 address
#define IP_STR_SZ (8*4+7+1)
void
ipstr
(
char
*
out
,
const
ip_addr_t
*
ip
);
void
ip4str
(
char
*
out
,
const
ip4_addr_t
*
ip
);
void
ip6str
(
char
*
out
,
const
ip6_addr_t
*
ip
);
#endif
components/
modules/wifi_common
.c
→
components/
base_nodemcu/ip_fmt
.c
View file @
e67c6f09
...
...
@@ -30,11 +30,11 @@
*
* @author Johny Mattsson <jmattsson@dius.com.au>
*/
#include "wifi_common.h"
#include <stdio.h>
#include "ip_fmt.h"
#include "lwip/sockets.h"
#include "lwip/ip_addr.h"
#include "lwip/ip4_addr.h"
#include <stdio.h>
void
macstr
(
char
*
str
,
const
uint8_t
*
mac
)
{
...
...
components/modules/wifi.c
View file @
e67c6f09
...
...
@@ -35,6 +35,7 @@
#include "lextra.h"
#include "esp_wifi.h"
#include "wifi_common.h"
#include "ip_fmt.h"
#include "nodemcu_esp_event.h"
#include <string.h>
...
...
components/modules/wifi_common.h
View file @
e67c6f09
...
...
@@ -34,7 +34,6 @@
#define _NODEMCU_WIFI_H_
#include <stdint.h>
#include "tcpip_adapter.h"
// Shared sta/ap macros
...
...
@@ -48,16 +47,4 @@
} while(0)
/* The mac/ip formatters should probably go into its own utility file... */
// String buffer for a formatted MAC/BSSID
#define MAC_STR_SZ (6*2+5+1)
void
macstr
(
char
*
out
,
const
uint8_t
*
mac
);
// String buffer for a formatted IPv4 or IPv6 address
#define IP_STR_SZ (8*4+7+1)
void
ipstr
(
char
*
out
,
const
ip_addr_t
*
ip
);
void
ip4str
(
char
*
out
,
const
ip4_addr_t
*
ip
);
void
ip6str
(
char
*
out
,
const
ip6_addr_t
*
ip
);
#endif
components/modules/wifi_sta.c
View file @
e67c6f09
...
...
@@ -36,6 +36,7 @@
#include "lmem.h"
#include "nodemcu_esp_event.h"
#include "wifi_common.h"
#include "ip_fmt.h"
#include "esp_wifi.h"
#include <string.h>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment