entr0p1
a8a6001576
MAX_CLIENTS is defined in both src/helpers/ClientACL.h and examples/simple_repeater/MyMesh.h. Appears it was centralised in the former header file some time ago. Both are included in some places and, depending on which order they're in, either value can win. This change drops the duplicate entry from the repeater firmware and bumps the central limit up to 32 (per the original repeater firmware value). Changes: - Remove MAX_CLIENTS from repeater MyMesh.h - Increase MAX_CLIENTS limit in ClientACL.h to 32
61 lines
1.7 KiB
C++
61 lines
1.7 KiB
C++
#pragma once
|
|
|
|
#include <Arduino.h> // needed for PlatformIO
|
|
#include <Mesh.h>
|
|
#include <helpers/IdentityStore.h>
|
|
|
|
#define PERM_ACL_ROLE_MASK 3 // lower 2 bits
|
|
#define PERM_ACL_GUEST 0
|
|
#define PERM_ACL_READ_ONLY 1
|
|
#define PERM_ACL_READ_WRITE 2
|
|
#define PERM_ACL_ADMIN 3
|
|
|
|
#define OUT_PATH_UNKNOWN 0xFF
|
|
|
|
struct ClientInfo {
|
|
mesh::Identity id;
|
|
uint8_t permissions;
|
|
uint8_t out_path_len;
|
|
uint8_t out_path[MAX_PATH_SIZE];
|
|
uint8_t shared_secret[PUB_KEY_SIZE];
|
|
uint32_t last_timestamp; // by THEIR clock (transient)
|
|
uint32_t last_activity; // by OUR clock (transient)
|
|
union {
|
|
struct {
|
|
uint32_t sync_since; // sync messages SINCE this timestamp (by OUR clock)
|
|
uint32_t pending_ack;
|
|
uint32_t push_post_timestamp;
|
|
unsigned long ack_timeout;
|
|
uint8_t push_failures;
|
|
} room;
|
|
} extra;
|
|
|
|
bool isAdmin() const { return (permissions & PERM_ACL_ROLE_MASK) == PERM_ACL_ADMIN; }
|
|
};
|
|
|
|
#ifndef MAX_CLIENTS
|
|
#define MAX_CLIENTS 32
|
|
#endif
|
|
|
|
class ClientACL {
|
|
FILESYSTEM* _fs;
|
|
ClientInfo clients[MAX_CLIENTS];
|
|
int num_clients;
|
|
|
|
public:
|
|
ClientACL() {
|
|
memset(clients, 0, sizeof(clients));
|
|
num_clients = 0;
|
|
}
|
|
void load(FILESYSTEM* _fs, const mesh::LocalIdentity& self_id);
|
|
void save(FILESYSTEM* _fs, bool (*filter)(ClientInfo*)=NULL);
|
|
bool clear();
|
|
|
|
ClientInfo* getClient(const uint8_t* pubkey, int key_len);
|
|
ClientInfo* putClient(const mesh::Identity& id, uint8_t init_perms);
|
|
bool applyPermissions(const mesh::LocalIdentity& self_id, const uint8_t* pubkey, int key_len, uint8_t perms);
|
|
|
|
int getNumClients() const { return num_clients; }
|
|
ClientInfo* getClientByIdx(int idx) { return &clients[idx]; }
|
|
};
|