projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm: mach-k3: Add secure device support
[oweals/u-boot.git]
/
drivers
/
net
/
netconsole.c
diff --git
a/drivers/net/netconsole.c
b/drivers/net/netconsole.c
index 350004757715011de9de0bb5b9176e36059dea1a..ce5a15ef57cea6ae378ef2dbd0ca3fbd2122a326 100644
(file)
--- a/
drivers/net/netconsole.c
+++ b/
drivers/net/netconsole.c
@@
-1,8
+1,7
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2004
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
/*
* (C) Copyright 2004
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-10,8
+9,6
@@
#include <stdio_dev.h>
#include <net.h>
#include <stdio_dev.h>
#include <net.h>
-DECLARE_GLOBAL_DATA_PTR;
-
#ifndef CONFIG_NETCONSOLE_BUFFER_SIZE
#define CONFIG_NETCONSOLE_BUFFER_SIZE 512
#endif
#ifndef CONFIG_NETCONSOLE_BUFFER_SIZE
#define CONFIG_NETCONSOLE_BUFFER_SIZE 512
#endif
@@
-62,8
+59,8
@@
static int is_broadcast(struct in_addr ip)
/* update only when the environment has changed */
if (env_changed_id != env_id) {
/* update only when the environment has changed */
if (env_changed_id != env_id) {
- netmask =
getenv
_ip("netmask");
- our_ip =
getenv
_ip("ipaddr");
+ netmask =
env_get
_ip("netmask");
+ our_ip =
env_get
_ip("ipaddr");
env_changed_id = env_id;
}
env_changed_id = env_id;
}
@@
-82,11
+79,11
@@
static int refresh_settings_from_env(void)
/* update only when the environment has changed */
if (env_changed_id != env_id) {
/* update only when the environment has changed */
if (env_changed_id != env_id) {
- if (
getenv
("ncip")) {
- nc_ip =
getenv
_ip("ncip");
+ if (
env_get
("ncip")) {
+ nc_ip =
env_get
_ip("ncip");
if (!nc_ip.s_addr)
return -1; /* ncip is 0.0.0.0 */
if (!nc_ip.s_addr)
return -1; /* ncip is 0.0.0.0 */
- p = strchr(
getenv
("ncip"), ':');
+ p = strchr(
env_get
("ncip"), ':');
if (p != NULL) {
nc_out_port = simple_strtoul(p + 1, NULL, 10);
nc_in_port = nc_out_port;
if (p != NULL) {
nc_out_port = simple_strtoul(p + 1, NULL, 10);
nc_in_port = nc_out_port;
@@
-95,10
+92,10
@@
static int refresh_settings_from_env(void)
nc_ip.s_addr = ~0; /* ncip is not set, so broadcast */
}
nc_ip.s_addr = ~0; /* ncip is not set, so broadcast */
}
- p =
getenv
("ncoutport");
+ p =
env_get
("ncoutport");
if (p != NULL)
nc_out_port = simple_strtoul(p, NULL, 10);
if (p != NULL)
nc_out_port = simple_strtoul(p, NULL, 10);
- p =
getenv
("ncinport");
+ p =
env_get
("ncinport");
if (p != NULL)
nc_in_port = simple_strtoul(p, NULL, 10);
if (p != NULL)
nc_in_port = simple_strtoul(p, NULL, 10);
@@
-153,14
+150,17
@@
int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port,
len = sizeof(input_buffer) - input_size;
end = input_offset + input_size;
len = sizeof(input_buffer) - input_size;
end = input_offset + input_size;
- if (end > sizeof(input_buffer))
+ if (end >
=
sizeof(input_buffer))
end -= sizeof(input_buffer);
chunk = len;
end -= sizeof(input_buffer);
chunk = len;
- if (end + len > sizeof(input_buffer)) {
+ /* Check if packet will wrap in input_buffer */
+ if (end + len >= sizeof(input_buffer)) {
chunk = sizeof(input_buffer) - end;
chunk = sizeof(input_buffer) - end;
+ /* Copy the second part of the pkt to start of input_buffer */
memcpy(input_buffer, pkt + chunk, len - chunk);
}
memcpy(input_buffer, pkt + chunk, len - chunk);
}
+ /* Copy first (or only) part of pkt after end of current valid input*/
memcpy(input_buffer + end, pkt, chunk);
input_size += len;
memcpy(input_buffer + end, pkt, chunk);
input_size += len;