summaryrefslogtreecommitdiff
path: root/lib/netutils/netutils.c
diff options
context:
space:
mode:
authorDamien George <damien@micropython.org>2021-07-09 12:38:25 +1000
committerDamien George <damien@micropython.org>2021-07-12 17:07:36 +1000
commit4d546713ec8858cbf908de45de11cbfc46a20971 (patch)
treefda10704c197bf3500f09297d29239c15f878fab /lib/netutils/netutils.c
parent925878b2f83e09987bd1688746b92898ee8bbcac (diff)
shared: Introduce new top-level dir and move 1st party lib code there.
This commit moves all first-party code developed for this project from lib/ to shared/, so that lib/ now only contains third-party code. The following directories are moved as-is from lib to shared: lib/libc -> shared/libc lib/memzip -> shared/memzip lib/netutils -> shared/netutils lib/timeutils -> shared/timeutils lib/upytesthelper -> shared/upytesthelper All files in lib/embed/ have been moved to shared/libc/. lib/mp-readline has been moved to shared/readline. lib/utils has been moved to shared/runtime, with the exception of lib/utils/printf.c which has been moved to shared/libc/printf.c. Signed-off-by: Damien George <damien@micropython.org>
Diffstat (limited to 'lib/netutils/netutils.c')
-rw-r--r--lib/netutils/netutils.c94
1 files changed, 0 insertions, 94 deletions
diff --git a/lib/netutils/netutils.c b/lib/netutils/netutils.c
deleted file mode 100644
index 40fbd5bca..000000000
--- a/lib/netutils/netutils.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- * Copyright (c) 2015 Daniel Campora
- *
- * 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.
- */
-
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "py/runtime.h"
-#include "lib/netutils/netutils.h"
-
-// Takes an array with a raw IPv4 address and returns something like '192.168.0.1'.
-mp_obj_t netutils_format_ipv4_addr(uint8_t *ip, netutils_endian_t endian) {
- char ip_str[16];
- mp_uint_t ip_len;
- if (endian == NETUTILS_LITTLE) {
- ip_len = snprintf(ip_str, 16, "%u.%u.%u.%u", ip[3], ip[2], ip[1], ip[0]);
- } else {
- ip_len = snprintf(ip_str, 16, "%u.%u.%u.%u", ip[0], ip[1], ip[2], ip[3]);
- }
- return mp_obj_new_str(ip_str, ip_len);
-}
-
-// Takes an array with a raw IP address, and a port, and returns a net-address
-// tuple such as ('192.168.0.1', 8080).
-mp_obj_t netutils_format_inet_addr(uint8_t *ip, mp_uint_t port, netutils_endian_t endian) {
- mp_obj_t tuple[2] = {
- tuple[0] = netutils_format_ipv4_addr(ip, endian),
- tuple[1] = mp_obj_new_int(port),
- };
- return mp_obj_new_tuple(2, tuple);
-}
-
-void netutils_parse_ipv4_addr(mp_obj_t addr_in, uint8_t *out_ip, netutils_endian_t endian) {
- size_t addr_len;
- const char *addr_str = mp_obj_str_get_data(addr_in, &addr_len);
- if (addr_len == 0) {
- // special case of no address given
- memset(out_ip, 0, NETUTILS_IPV4ADDR_BUFSIZE);
- return;
- }
- const char *s = addr_str;
- const char *s_top = addr_str + addr_len;
- for (mp_uint_t i = 3; ; i--) {
- mp_uint_t val = 0;
- for (; s < s_top && *s != '.'; s++) {
- val = val * 10 + *s - '0';
- }
- if (endian == NETUTILS_LITTLE) {
- out_ip[i] = val;
- } else {
- out_ip[NETUTILS_IPV4ADDR_BUFSIZE - 1 - i] = val;
- }
- if (i == 0 && s == s_top) {
- return;
- } else if (i > 0 && s < s_top && *s == '.') {
- s++;
- } else {
- mp_raise_ValueError(MP_ERROR_TEXT("invalid arguments"));
- }
- }
-}
-
-// Takes an address of the form ('192.168.0.1', 8080), returns the port and
-// puts IP in out_ip (which must take at least IPADDR_BUF_SIZE bytes).
-mp_uint_t netutils_parse_inet_addr(mp_obj_t addr_in, uint8_t *out_ip, netutils_endian_t endian) {
- mp_obj_t *addr_items;
- mp_obj_get_array_fixed_n(addr_in, 2, &addr_items);
- netutils_parse_ipv4_addr(addr_items[0], out_ip, endian);
- return mp_obj_get_int(addr_items[1]);
-}