OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

Merge branch 'master' of github:OpenIPC/openipc-2.1

pull/67/head
Igor Zalatov (from Citadel PC) 2021-11-05 22:28:27 +03:00
parent 1c922c1380 9fca5b0954
commit 8db2e49e96
5 changed files with 70 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/index.md
View File

@ -94,9 +94,9 @@ If you like our work, please consider supporting us on [Opencollective](https://
| T20 |
| T21 |
| T31 |
| XM510 | | ✅ | ✅|
| XM530 | | ✅ | ✅|
| XM550 | | ✅ | ✅|
| XM510 | | ✅ | ✅ | ✅ |
| XM530 | | ✅ | ✅ | ✅ |
| XM550 | | ✅ | ✅ | ✅ |
### Commercial Support
<a id="commercial"></a>

15
general/package/mbedtls-openipc/mbedtls-openipc.mk
View File

@ -13,19 +13,20 @@ MBEDTLS_OPENIPC_INSTALL_STAGING = YES
MBEDTLS_OPENIPC_LICENSE = Apache-2.0
MBEDTLS_OPENIPC_LICENSE_FILES = apache-2.0.txt
# This is mandatory for hiawatha
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
define MBEDTLS_ENABLE_THREADING
$(SED) "s://#define MBEDTLS_THREADING_C:#define MBEDTLS_THREADING_C:" \
define MBEDTLS_ENABLE_SRTP
$(SED) "s://#define MBEDTLS_SSL_DTLS_SRTP:#define MBEDTLS_SSL_DTLS_SRTP:" \
$(@D)/include/mbedtls/config.h
$(SED) "s://#define MBEDTLS_THREADING_PTHREAD:#define MBEDTLS_THREADING_PTHREAD:" \
$(SED) "s:#define MBEDTLS_SSL_CBC_RECORD_SPLITTING://#define MBEDTLS_SSL_CBC_RECORD_SPLITTING:" \
$(@D)/include/mbedtls/config.h
$(SED) "s:#define MBEDTLS_ECP_DP_SECP224K1_ENABLED://#define MBEDTLS_ECP_DP_SECP224K1_ENABLED:" \
$(@D)/include/mbedtls/config.h
$(SED) "s:#define MBEDTLS_ECP_DP_SECP256K1_ENABLED://#define MBEDTLS_ECP_DP_SECP256K1_ENABLED:" \
$(@D)/include/mbedtls/config.h
endef
MBEDTLS_OPENIPC_POST_PATCH_HOOKS += MBEDTLS_ENABLE_THREADING
MBEDTLS_OPENIPC_POST_PATCH_HOOKS += MBEDTLS_ENABLE_SRTP
ifeq ($(BR2_STATIC_LIBS),y)
MBEDTLS_OPENIPC_CONF_OPTS += -DLINK_WITH_PTHREAD=ON
endif
endif
ifeq ($(BR2_STATIC_LIBS),y)
MBEDTLS_OPENIPC_CONF_OPTS += \

42
general/package/xmdp/src/netip.c
View File

@ -4,8 +4,10 @@
#include <string.h>
#include <arpa/inet.h>
#include <fcntl.h>
#include <netinet/in.h>
#include <sys/socket.h>
#include <unistd.h>
#include "cjson/cJSON.h"
#include "netip.h"
@ -43,8 +45,9 @@ typedef union netip_pkt {
#define NETIP_HSIZE sizeof(netip_preabmle_t)
#define NETIP_MAX_JSON sizeof(resp) - NETIP_HSIZE - 1
bool netip_connect(const char *addr, uint16_t port) {
bool res = true;
enum ConnectStatus netip_connect(const char *addr, uint16_t port) {
bool res = CONNECT_OK;
cJSON *json = NULL;
int s = socket(AF_INET, SOCK_STREAM, 0);
if (s == -1)
@ -55,8 +58,22 @@ bool netip_connect(const char *addr, uint16_t port) {
srv.sin_family = AF_INET;
srv.sin_port = htons(port);
if (connect(s, (struct sockaddr *)&srv, sizeof(srv)) < 0)
return false;
const int flags = fcntl(s, F_GETFL, 0);
fcntl(s, F_SETFL, flags | O_NONBLOCK);
(void)connect(s, (struct sockaddr *)&srv, sizeof(srv));
fd_set fdset;
FD_ZERO(&fdset);
FD_SET(s, &fdset);
struct timeval tv = {
.tv_sec = 2, /* 2 second timeout */
};
if (select(s + 1, NULL, &fdset, NULL, &tv) != 1) {
res = CONNECT_ERR;
goto quit;
}
fcntl(s, F_SETFL, flags);
netip_pkt_t msg;
memset(&msg.header, 0, sizeof(msg.header));
@ -69,29 +86,30 @@ bool netip_connect(const char *addr, uint16_t port) {
msg.header.len_data = sizeof(default_login);
if (send(s, &msg, sizeof(default_login) + NETIP_HSIZE, 0) < 0) {
puts("Send failed");
return false;
return CONNECT_ERR;
}
if (recv(s, &msg, sizeof(msg), 0) <= NETIP_HSIZE) {
puts("recv failed");
}
cJSON *json = cJSON_Parse(msg.header.data);
json = cJSON_Parse(msg.header.data);
if (!json) {
const char *error_ptr = cJSON_GetErrorPtr();
if (error_ptr != NULL) {
fprintf(stderr, "Error before: %s\n", error_ptr);
}
res = false;
goto skip_loop;
res = CONNECT_ERR;
goto quit;
}
const int retval = get_json_intval(json, "Ret", 0);
if (retval != RESULT_OK)
return false;
return CONNECT_PWDREQ;
skip_loop:
cJSON_Delete(json);
quit:
if (json)
cJSON_Delete(json);
close(s);
return res;
}

8
general/package/xmdp/src/netip.h
View File

@ -1,6 +1,12 @@
#ifndef NETIP_H
#define NETIP_H
bool netip_connect(const char* addr, uint16_t port);
enum ConnectStatus {
CONNECT_OK,
CONNECT_ERR,
CONNECT_PWDREQ,
};
enum ConnectStatus netip_connect(const char *addr, uint16_t port);
#endif /* NETIP_H */

34
general/package/xmdp/src/xmdp.c
View File

@ -26,6 +26,18 @@ const char brpkt[] =
"\x00\x00\x00\x00";
static const char *Reset = "\x1b[0m";
static const char *FgRed = "\x1b[31m";
static const char *FgBrightRed = "\033[31;1m";
static const char *color(enum ConnectStatus status) {
switch (status) {
case CONNECT_OK:
return FgRed;
case CONNECT_ERR:
return FgBrightRed;
default:
return "";
}
}
// get sockaddr, IPv4 or IPv6:
void *get_in_addr(struct sockaddr *sa) {
@ -175,7 +187,7 @@ int main() {
ipaddr_from32bit(abuf, sizeof abuf, host_ip);
host_ip = abuf;
}
bool netip_ok = netip_connect(host_ip, netip_port);
enum ConnectStatus netip_conn = netip_connect(host_ip, netip_port);
char verstr[128] = {0};
if (strlen(version)) {
@ -191,23 +203,21 @@ int main() {
version++;
}
if (strlen(builddt)) {
const char *end;
if ((end = strchr(builddt, ' '))) {
strcat(verstr + strlen(verstr), " (");
snprintf(verstr + strlen(verstr),
MIN(sizeof(verstr) - strlen(verstr), end - builddt + 1),
"%s", builddt);
strcat(verstr + strlen(verstr), ")");
}
if (strlen(builddt) == 19 && builddt[10] == ' ') {
const char *end = builddt + 10;
strcat(verstr + strlen(verstr), " (");
snprintf(verstr + strlen(verstr),
MIN(sizeof(verstr) - strlen(verstr), end - builddt + 1), "%s",
builddt);
strcat(verstr + strlen(verstr), ")");
}
}
printf("%s%s\t%s\t%s %s, %s", netip_ok ? FgRed : "", host_ip, mac,
printf("%s%s\t%s\t%s %s, %s", color(netip_conn), host_ip, mac,
chan_num > 1 ? "DVR" : "IPC", sn, hostname);
if (strlen(verstr))
printf("\t%s", verstr);
printf("%s\n", netip_ok ? Reset : "");
printf("%s\n", *color(netip_conn) ? Reset : "");
skip_loop: