Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qthing
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jens Nolte
qthing
Commits
e23d3e31
Commit
e23d3e31
authored
5 years ago
by
fxk8y
Browse files
Options
Downloads
Patches
Plain Diff
using magic strings instead of magic numbers
parent
6230730b
Branches
feature/bme280
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
main/network/udp.cpp
+24
-37
24 additions, 37 deletions
main/network/udp.cpp
main/qthing.h
+1
-1
1 addition, 1 deletion
main/qthing.h
with
25 additions
and
38 deletions
main/network/udp.cpp
+
24
−
37
View file @
e23d3e31
...
@@ -13,32 +13,20 @@ static const char *TAG = "udp-server";
...
@@ -13,32 +13,20 @@ static const char *TAG = "udp-server";
static
const
in_port_t
PORT
=
4213
;
static
const
in_port_t
PORT
=
4213
;
static
std
::
map
<
uint32_t
,
qthing
::
udpPacketCallback
>
packetCallbackMap
;
static
std
::
map
<
std
::
string
,
qthing
::
udpPacketCallback
>
packetCallbackMap
;
void
qthing
::
addUDPPacketCallback
(
uint32_t
magicNumber
,
qthing
::
udpPacketCallback
callback
)
{
void
qthing
::
addUDPPacketCallback
(
std
::
string
magicString
,
qthing
::
udpPacketCallback
callback
)
{
if
(
packetCallbackMap
.
count
(
magic
Number
)
>
0
)
{
if
(
packetCallbackMap
.
count
(
magic
String
)
>
0
)
{
qthing
::
udpPacketCallback
old_callback
=
packetCallbackMap
.
at
(
magic
Number
);
qthing
::
udpPacketCallback
old_callback
=
packetCallbackMap
.
at
(
magic
String
);
packetCallbackMap
[
magic
Number
]
=
[
old_callback
,
callback
](
udpPacket
packet
)
{
packetCallbackMap
[
magic
String
]
=
[
old_callback
,
callback
](
udpPacket
packet
)
{
old_callback
(
packet
);
old_callback
(
packet
);
callback
(
packet
);
callback
(
packet
);
};
};
}
else
{
}
else
{
packetCallbackMap
[
magic
Number
]
=
callback
;
packetCallbackMap
[
magic
String
]
=
callback
;
}
}
ESP_LOGI
(
TAG
,
"Registered callback for packets with magic number 0x%08X"
,
magicNumber
);
ESP_LOGI
(
TAG
,
"Registered callback for packets with magic string %s"
,
magicString
.
c_str
());
}
std
::
string
to_string
(
struct
sockaddr_in6
sourceAddr
)
{
char
addr_str
[
128
];
if
(
sourceAddr
.
sin6_family
==
PF_INET
)
{
inet_ntoa_r
(((
struct
sockaddr_in
*
)
&
sourceAddr
)
->
sin_addr
.
s_addr
,
addr_str
,
sizeof
(
addr_str
)
-
1
);
}
else
if
(
sourceAddr
.
sin6_family
==
PF_INET6
)
{
inet6_ntoa_r
(
sourceAddr
.
sin6_addr
,
addr_str
,
sizeof
(
addr_str
)
-
1
);
}
return
(
std
::
string
(
addr_str
));
}
}
static
char
rx_buffer
[
2048
];
// TODO: get MTU
static
char
rx_buffer
[
2048
];
// TODO: get MTU
...
@@ -76,6 +64,7 @@ static void udp_server_task(void *pvParameters)
...
@@ -76,6 +64,7 @@ static void udp_server_task(void *pvParameters)
struct
sockaddr_in6
sourceAddr
;
// Large enough for both IPv4 or IPv6
struct
sockaddr_in6
sourceAddr
;
// Large enough for both IPv4 or IPv6
socklen_t
socklen
=
sizeof
(
sourceAddr
);
socklen_t
socklen
=
sizeof
(
sourceAddr
);
memset
(
rx_buffer
,
0
,
sizeof
(
rx_buffer
));
int
len
=
recvfrom
(
sock
,
rx_buffer
,
sizeof
(
rx_buffer
)
-
1
,
0
,
(
struct
sockaddr
*
)
&
sourceAddr
,
&
socklen
);
int
len
=
recvfrom
(
sock
,
rx_buffer
,
sizeof
(
rx_buffer
)
-
1
,
0
,
(
struct
sockaddr
*
)
&
sourceAddr
,
&
socklen
);
// Error occured during receiving
// Error occured during receiving
...
@@ -85,30 +74,28 @@ static void udp_server_task(void *pvParameters)
...
@@ -85,30 +74,28 @@ static void udp_server_task(void *pvParameters)
}
}
// Data received
// Data received
else
{
else
{
ESP_LOGI
(
TAG
,
"Received %d bytes from %s:"
,
len
,
to_string
(
sourceAddr
).
c_str
());
ESP_LOGI
(
TAG
,
"Received %d bytes from %s"
,
len
,
to_string
(
sourceAddr
).
c_str
());
if
(
len
>=
sizeof
(
uint32_t
))
{
std
::
string
payload_str
(
rx_buffer
);
int16_t
lenBestMatch
=
-
1
;
qthing
::
udpPacketCallback
callback
=
NULL
;
for
(
auto
it
=
packetCallbackMap
.
begin
();
it
!=
packetCallbackMap
.
end
();
++
it
)
{
if
(
len
>=
it
->
first
.
length
()
&&
payload_str
.
find
(
it
->
first
)
==
0
)
{
lenBestMatch
=
len
;
callback
=
it
->
second
;
}
}
uint32_t
magicNumber
=
rx_buffer
[
0
]
<<
24
|
if
(
lenBestMatch
>
-
1
)
{
rx_buffer
[
1
]
<<
16
|
rx_buffer
[
2
]
<<
8
|
rx_buffer
[
3
];
qthing
::
udpPacket
packet
=
{
qthing
::
udpPacket
packet
=
{
.
sourceAddr
=
sourceAddr
,
.
sourceAddr
=
sourceAddr
,
.
payload
=
rx_buffer
+
4
,
.
payload
=
rx_buffer
,
.
length
=
(
uint16_t
)
(
len
-
4
)
.
length
=
(
uint16_t
)
len
};
};
auto
iterator
=
packetCallbackMap
.
find
(
magicNumber
);
callback
(
packet
);
if
(
iterator
!=
packetCallbackMap
.
end
())
{
auto
callback
=
iterator
->
second
;
callback
(
packet
);
}
else
{
ESP_LOGW
(
TAG
,
"Packet has unknown magic number 0x%08X"
,
magicNumber
);
}
}
else
{
}
else
{
ESP_LOGW
(
TAG
,
"Packet
is too small, cannot determine
magic
number
"
);
ESP_LOGW
(
TAG
,
"Packet
has unknown
magic
string
"
);
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
main/qthing.h
+
1
−
1
View file @
e23d3e31
...
@@ -130,7 +130,7 @@ namespace qthing {
...
@@ -130,7 +130,7 @@ namespace qthing {
}
udpPacket
;
}
udpPacket
;
typedef
std
::
function
<
void
(
udpPacket
)
>
udpPacketCallback
;
typedef
std
::
function
<
void
(
udpPacket
)
>
udpPacketCallback
;
void
addUDPPacketCallback
(
uint32_t
magicNumber
,
udpPacketCallback
callback
);
void
addUDPPacketCallback
(
std
::
string
magicString
,
udpPacketCallback
callback
);
void
start_udp_server
();
void
start_udp_server
();
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment