KolibriOS/umka
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add wrappers of f76 ARP functions.

Browse Source
This commit is contained in:
Ivan Baravy 2020-05-07 20:48:17 +03:00
parent 5d99380431
commit aac2122c2c
3 changed files with 342 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/024_#net_#f76_all.t
View File

@ -5,5 +5,19 @@ net_get_dev_name 1
net_dev_reset 1
net_eth_read_mac 1
net_ipv4_set_subnet 1 0.0.0.0
net_ipv4_get_subnet 1
net_ipv4_set_gw 1 192.168.1.1
net_ipv4_get_gw 1
net_ipv4_set_dns 1 217.10.36.5
net_ipv4_get_dns 1
net_ipv4_set_addr 1 192.168.1.27
net_ipv4_get_addr 1
net_arp_get_count 1
net_arp_add_entry 1 192.168.1.26 80:2b:f9:3b:6c:c9 0 64
net_arp_get_count 1

137
umka.h
View File

@ -308,6 +308,14 @@ typedef struct {
uint8_t data[0];
} net_buff_t;
typedef struct {
uint32_t ip;
uint8_t mac[6];
uint16_t status;
uint16_t ttl;
} arp_entry_t;
void kos_init(void);
void i40(void);
uint32_t kos_time_to_epoch(uint32_t *time);
@ -1042,12 +1050,84 @@ static inline f76ret_t umka_sys_net_ipv4_set_addr(uint32_t dev_num,
return r;
}
// Function 76, Protocol 1 - IPv4, Subfunction 4, Read DNS address ===
// Function 76, Protocol 1 - IPv4, Subfunction 5, Set DNS address ===
// Function 76, Protocol 1 - IPv4, Subfunction 6, Read subnet mask ===
// Function 76, Protocol 1 - IPv4, Subfunction 7, Set subnet mask ===
// Function 76, Protocol 1 - IPv4, Subfunction 8, Read gateway ====
// Function 76, Protocol 1 - IPv4, Subfunction 9, Set gateway =====
static inline f76ret_t umka_sys_net_ipv4_get_dns(uint32_t dev_num) {
f76ret_t r;
__asm__ __inline__ __volatile__ (
"call i40"
: "=a"(r.eax),
"=b"(r.ebx)
: "a"(76),
"b"((1 << 16) + (dev_num << 8) + 4)
: "memory");
return r;
}
static inline f76ret_t umka_sys_net_ipv4_set_dns(uint32_t dev_num,
uint32_t dns) {
f76ret_t r;
__asm__ __inline__ __volatile__ (
"call i40"
: "=a"(r.eax),
"=b"(r.ebx)
: "a"(76),
"b"((1 << 16) + (dev_num << 8) + 5),
"c"(dns)
: "memory");
return r;
}
static inline f76ret_t umka_sys_net_ipv4_get_subnet(uint32_t dev_num) {
f76ret_t r;
__asm__ __inline__ __volatile__ (
"call i40"
: "=a"(r.eax),
"=b"(r.ebx)
: "a"(76),
"b"((1 << 16) + (dev_num << 8) + 6)
: "memory");
return r;
}
static inline f76ret_t umka_sys_net_ipv4_set_subnet(uint32_t dev_num,
uint32_t subnet) {
f76ret_t r;
__asm__ __inline__ __volatile__ (
"call i40"
: "=a"(r.eax),
"=b"(r.ebx)
: "a"(76),
"b"((1 << 16) + (dev_num << 8) + 7),
"c"(subnet)
: "memory");
return r;
}
static inline f76ret_t umka_sys_net_ipv4_get_gw(uint32_t dev_num) {
f76ret_t r;
__asm__ __inline__ __volatile__ (
"call i40"
: "=a"(r.eax),
"=b"(r.ebx)
: "a"(76),
"b"((1 << 16) + (dev_num << 8) + 8)
: "memory");
return r;
}
static inline f76ret_t umka_sys_net_ipv4_set_gw(uint32_t dev_num,
uint32_t gw) {
f76ret_t r;
__asm__ __inline__ __volatile__ (
"call i40"
: "=a"(r.eax),
"=b"(r.ebx)
: "a"(76),
"b"((1 << 16) + (dev_num << 8) + 9),
"c"(gw)
: "memory");
return r;
}
// Function 76, Protocol 2 - ICMP, Subfunction 0, Read # Packets sent =
// Function 76, Protocol 2 - ICMP, Subfunction 1, Read # Packets rcvd =
// Function 76, Protocol 3 - UDP, Subfunction 0, Read # Packets sent ==
@ -1056,8 +1136,49 @@ static inline f76ret_t umka_sys_net_ipv4_set_addr(uint32_t dev_num,
// Function 76, Protocol 4 - TCP, Subfunction 1, Read # Packets rcvd ==
// Function 76, Protocol 5 - ARP, Subfunction 0, Read # Packets sent ==
// Function 76, Protocol 5 - ARP, Subfunction 1, Read # Packets rcvd ==
// Function 76, Protocol 5 - ARP, Subfunction 2, Read # ARP entries ==
// Function 76, Protocol 5 - ARP, Subfunction 3, Read ARP entry ====
static inline f76ret_t umka_sys_net_arp_get_count(uint32_t dev_num) {
f76ret_t r;
__asm__ __inline__ __volatile__ (
"call i40"
: "=a"(r.eax),
"=b"(r.ebx)
: "a"(76),
"b"((5 << 16) + (dev_num << 8) + 2)
: "memory");
return r;
}
static inline f76ret_t umka_sys_net_arp_get_entry(uint32_t dev_num,
uint32_t arp_num,
void *buf) {
f76ret_t r;
__asm__ __inline__ __volatile__ (
"call i40"
: "=a"(r.eax),
"=b"(r.ebx)
: "a"(76),
"b"((5 << 16) + (dev_num << 8) + 3),
"c"(arp_num),
"D"(buf)
: "memory");
return r;
}
static inline f76ret_t umka_sys_net_arp_add_entry(uint32_t dev_num,
void *buf) {
f76ret_t r;
__asm__ __inline__ __volatile__ (
"call i40"
: "=a"(r.eax),
"=b"(r.ebx)
: "a"(76),
"b"((5 << 16) + (dev_num << 8) + 4),
"S"(buf)
: "memory");
return r;
}
// Function 76, Protocol 5 - ARP, Subfunction 4, Add ARP entry ====
// Function 76, Protocol 5 - ARP, Subfunction 5, Remove ARP entry ====
// Function 76, Protocol 5 - ARP, Subfunction 6, Send ARP announce ==

199
umka_shell.c
View File

@ -1452,6 +1452,196 @@ void shell_net_ipv4_set_addr(int argc, char **argv) {
}
}
void shell_net_ipv4_get_dns(int argc, char **argv) {
const char *usage = \
"usage: net_ipv4_get_dns <dev_num>\n"
" dev_num device number as returned by net_add_device";
if (argc != 2) {
puts(usage);
return;
}
uint32_t dev_num = strtoul(argv[1], NULL, 0);
f76ret_t r = umka_sys_net_ipv4_get_dns(dev_num);
if (r.eax == UINT32_MAX) {
printf("status: fail\n");
} else {
printf("%d.%d.%d.%d\n",
(uint8_t)(r.eax >> 0), (uint8_t)(r.eax >> 8),
(uint8_t)(r.eax >> 16), (uint8_t)(r.eax >> 24));
}
}
void shell_net_ipv4_set_dns(int argc, char **argv) {
const char *usage = \
"usage: net_ipv4_set_dns <dev_num> <dns>\n"
" dev_num device number as returned by net_add_device\n"
" dns a.b.c.d";
if (argc != 3) {
puts(usage);
return;
}
uint32_t dev_num = strtoul(argv[1], NULL, 0);
uint32_t dns = inet_addr(argv[2]);
f76ret_t r = umka_sys_net_ipv4_set_dns(dev_num, dns);
if (r.eax == UINT32_MAX) {
printf("status: fail\n");
} else {
printf("status: ok\n");
}
}
void shell_net_ipv4_get_subnet(int argc, char **argv) {
const char *usage = \
"usage: net_ipv4_get_subnet <dev_num>\n"
" dev_num device number as returned by net_add_device";
if (argc != 2) {
puts(usage);
return;
}
uint32_t dev_num = strtoul(argv[1], NULL, 0);
f76ret_t r = umka_sys_net_ipv4_get_subnet(dev_num);
if (r.eax == UINT32_MAX) {
printf("status: fail\n");
} else {
printf("%d.%d.%d.%d\n",
(uint8_t)(r.eax >> 0), (uint8_t)(r.eax >> 8),
(uint8_t)(r.eax >> 16), (uint8_t)(r.eax >> 24));
}
}
void shell_net_ipv4_set_subnet(int argc, char **argv) {
const char *usage = \
"usage: net_ipv4_set_subnet <dev_num> <subnet>\n"
" dev_num device number as returned by net_add_device\n"
" subnet a.b.c.d";
if (argc != 3) {
puts(usage);
return;
}
uint32_t dev_num = strtoul(argv[1], NULL, 0);
char *subnet_str = argv[2];
uint32_t subnet = inet_addr(subnet_str);
f76ret_t r = umka_sys_net_ipv4_set_subnet(dev_num, subnet);
if (r.eax == UINT32_MAX) {
printf("status: fail\n");
} else {
printf("status: ok\n");
}
}
void shell_net_ipv4_get_gw(int argc, char **argv) {
const char *usage = \
"usage: net_ipv4_get_gw <dev_num>\n"
" dev_num device number as returned by net_add_device";
if (argc != 2) {
puts(usage);
return;
}
uint32_t dev_num = strtoul(argv[1], NULL, 0);
f76ret_t r = umka_sys_net_ipv4_get_gw(dev_num);
if (r.eax == UINT32_MAX) {
printf("status: fail\n");
} else {
printf("%d.%d.%d.%d\n",
(uint8_t)(r.eax >> 0), (uint8_t)(r.eax >> 8),
(uint8_t)(r.eax >> 16), (uint8_t)(r.eax >> 24));
}
}
void shell_net_ipv4_set_gw(int argc, char **argv) {
const char *usage = \
"usage: net_ipv4_set_gw <dev_num> <gw>\n"
" dev_num device number as returned by net_add_device\n"
" gw a.b.c.d";
if (argc != 3) {
puts(usage);
return;
}
uint32_t dev_num = strtoul(argv[1], NULL, 0);
char *gw_str = argv[2];
uint32_t gw = inet_addr(gw_str);
f76ret_t r = umka_sys_net_ipv4_set_gw(dev_num, gw);
if (r.eax == UINT32_MAX) {
printf("status: fail\n");
} else {
printf("status: ok\n");
}
}
void shell_net_arp_get_count(int argc, char **argv) {
const char *usage = \
"usage: net_arp_get_count <dev_num>\n"
" dev_num device number as returned by net_add_device";
if (argc != 2) {
puts(usage);
return;
}
uint32_t dev_num = strtoul(argv[1], NULL, 0);
f76ret_t r = umka_sys_net_arp_get_count(dev_num);
if (r.eax == UINT32_MAX) {
printf("status: fail\n");
} else {
printf("%" PRIi32 "\n", r.eax);
}
}
void shell_net_arp_get_entry(int argc, char **argv) {
const char *usage = \
"usage: net_arp_get_entry <dev_num>\n"
" dev_num device number as returned by net_add_device\n"
" arp_num arp number as returned by net_add_device";
if (argc != 3) {
puts(usage);
return;
}
uint32_t dev_num = strtoul(argv[1], NULL, 0);
uint32_t arp_num = strtoul(argv[2], NULL, 0);
arp_entry_t arp;
f76ret_t r = umka_sys_net_arp_get_entry(dev_num, arp_num, &arp);
if (r.eax == UINT32_MAX) {
printf("status: fail\n");
} else {
printf("arp #%u: IP %d.%d.%d.%d, "
"mac %2.2" SCNu8 ":%2.2" SCNu8 ":%2.2" SCNu8
":%2.2" SCNu8 ":%2.2" SCNu8 ":%2.2" SCNu8 " "
"status %" PRIu16 " "
"ttl %" PRIu16 "\n",
arp_num,
(uint8_t)(arp.ip >> 0), (uint8_t)(arp.ip >> 8),
(uint8_t)(arp.ip >> 16), (uint8_t)(arp.ip >> 24),
arp.mac[0], arp.mac[1], arp.mac[2],
arp.mac[3], arp.mac[4], arp.mac[5],
arp.status, arp.ttl);
}
}
void shell_net_arp_add_entry(int argc, char **argv) {
const char *usage = \
"usage: net_arp_add_entry <dev_num> <addr> <mac> <status> <ttl>\n"
" dev_num device number as returned by net_add_device\n"
" arp_num arp number as returned by net_add_device";
if (argc != 6) {
puts(usage);
return;
}
arp_entry_t arp;
uint32_t dev_num = strtoul(argv[1], NULL, 0);
arp.ip = inet_addr(argv[2]);
sscanf(argv[3], "%" SCNu8 ":%" SCNu8 ":%" SCNu8
":%" SCNu8 ":%" SCNu8 ":%" SCNu8,
arp.mac+0, arp.mac+1, arp.mac+2,
arp.mac+3, arp.mac+4, arp.mac+5);
arp.status = strtoul(argv[4], NULL, 0);
arp.ttl = strtoul(argv[5], NULL, 0);
fprintf(stderr, "## before\n");
f76ret_t r = umka_sys_net_arp_add_entry(dev_num, &arp);
fprintf(stderr, "## after\n");
if (r.eax == UINT32_MAX) {
printf("status: fail\n");
} else {
printf("%" PRIi32 "\n", r.eax);
}
}
typedef struct {
@ -1526,6 +1716,15 @@ func_table_t funcs[] = {
{ "net_eth_read_mac", shell_net_eth_read_mac },
{ "net_ipv4_get_addr", shell_net_ipv4_get_addr },
{ "net_ipv4_set_addr", shell_net_ipv4_set_addr },
{ "net_ipv4_get_dns", shell_net_ipv4_get_dns },
{ "net_ipv4_set_dns", shell_net_ipv4_set_dns },
{ "net_ipv4_get_subnet", shell_net_ipv4_get_subnet },
{ "net_ipv4_set_subnet", shell_net_ipv4_set_subnet },
{ "net_ipv4_get_gw", shell_net_ipv4_get_gw },
{ "net_ipv4_set_gw", shell_net_ipv4_set_gw },
{ "net_arp_get_count", shell_net_arp_get_count },
{ "net_arp_get_entry", shell_net_arp_get_entry },
{ "net_arp_add_entry", shell_net_arp_add_entry },
{ NULL, NULL },
};