Start reorganization of low level library

[ngadmin] / raw / include / attr.h

diff --git a/raw/include/attr.h b/raw/include/attr.h
index dfbdce0e58d17279fa6b8b02b6e0cc0bd4ecc9a7..24fa023590c46555fca53cc0694b887075820083 100644 (file)
--- a/raw/include/attr.h
+++ b/raw/include/attr.h
@@ -3,130 +3,75 @@
 #define DEF_ATTR
 
 
-#include <stdbool.h>
-
-#include "protocol.h"
-
-
-#define ATTR_PRODUCT           0x0001
-#define ATTR_UNK_0002          0x0002
-#define ATTR_NAME              0x0003
-#define ATTR_MAC               0x0004
-#define ATTR_UNK_0005          0x0005
-#define ATTR_IP                        0x0006
-#define ATTR_NETMASK           0x0007
-#define ATTR_GATEWAY           0x0008
-#define ATTR_NEW_PASSWORD      0x0009
-#define ATTR_PASSWORD          0x000A
-#define ATTR_DHCP              0x000B
-#define ATTR_UNK_000C          0x000C
-#define ATTR_FIRM_VER          0x000D
-#define ATTR_UNK_000E          0x000E
-#define ATTR_UNK_000F          0x000F
-#define ATTR_FIRM_UPGRADE      0x0010
-#define ATTR_RESTART           0x0013
-#define ATTR_ENCPASS           0x0014
-#define ATTR_DEFAULTS          0x0400
-#define ATTR_PORT_STATUS       0x0C00
-#define ATTR_PORT_STATISTICS   0x1000
-#define ATTR_STATS_RESET       0x1400
-#define ATTR_CABLETEST_DO      0x1800
-#define ATTR_CABLETEST_RESULT  0x1C00
-#define ATTR_VLAN_TYPE         0x2000
-#define ATTR_VLAN_PORT_CONF    0x2400
-#define ATTR_VLAN_DOT_CONF     0x2800
-#define ATTR_VLAN_DESTROY      0x2C00
-#define ATTR_VLAN_PVID         0x3000
-#define ATTR_QOS_TYPE          0x3400
-#define ATTR_QOS_CONFIG                0x3800
-#define ATTR_BITRATE_INPUT     0x4C00
-#define ATTR_BITRATE_OUTPUT    0x5000
-#define ATTR_STORM_ENABLE      0x5400
-#define ATTR_STORM_BITRATE     0x5800
-#define ATTR_MIRROR            0x5C00
-#define ATTR_PORTS_COUNT       0x6000
-#define ATTR_MAX_VLAN          0x6400
-#define ATTR_IGMP_ENABLE_VLAN  0x6800
-#define ATTR_IGMP_BLOCK_UNK    0x6C00
-#define ATTR_IGMP_VALID_V3     0x7000
-#define ATTR_TLV_BITMAP                0x7400
-#define ATTR_END               0xFFFF
-
-#define UNUSED                 __attribute__((unused))
-
-
-struct attr_handler {
-       unsigned short attr;                                    /* attribute code */
-       unsigned int size;                                      /* expected data size */
-       bool (*encode)(struct attr *at, unsigned char ports);   /* encode function */
-       bool (*decode)(struct attr *at, unsigned char ports);   /* decode function */
-};
+#include <stdlib.h>
 
+#include <arpa/inet.h>
 
-const struct attr_handler* getAttrHandler (unsigned short attrcode);
+#include <list.h>
 
 
 
+struct attr {
+       unsigned short attr;    /* attribute code */
+       unsigned short size;    /* attribute size */
+       void *data;             /* attribute data */
+};
 
-struct attr_port_status {
-       unsigned char port;
-       unsigned char status;
-       unsigned char unk;
-} __attribute__((packed));
 
 
-struct attr_port_stat {
-       unsigned char port;
-       unsigned long long recv;
-       unsigned long long sent;
-       unsigned long long unk1;
-       unsigned long long unk2;
-       unsigned long long unk3;
-       unsigned long long crc;
-} __attribute__((packed));
+struct attr* newAttr (unsigned short attr, unsigned short size, void *data);
 
 
-struct attr_bitrate {
-       unsigned char port;
-       int bitrate;
-} __attribute__((packed));
+static inline struct attr* newEmptyAttr (unsigned short attr)
+{
+       return newAttr(attr, 0, NULL);
+}
 
 
-struct attr_qos {
-       unsigned char port;
-       unsigned char prio;
-} __attribute__((packed));
+static inline struct attr* newByteAttr (unsigned short attr, unsigned char value)
+{
+       char *v = malloc(sizeof(char));
+       
+       *v = value;
+       
+       return newAttr(attr, sizeof(char), v);
+}
 
 
-struct attr_pvid {
-       unsigned char port;
-       unsigned short vlan;
-} __attribute__((packed));
+static inline struct attr* newShortAttr (unsigned short attr, short value)
+{
+       short *v = malloc(sizeof(short));
+       
+       *v = value;
+       
+       return newAttr(attr, sizeof(short), v);
+}
 
 
-struct attr_igmp_vlan {
-       unsigned short enable;
-       unsigned short vlan;
-} __attribute__((packed));
+static inline struct attr* newIntAttr (unsigned short attr, int value)
+{
+       int *v = malloc(sizeof(int));
+       
+       *v = value;
+       
+       return newAttr(attr, sizeof(int), v);
+}
 
 
-struct attr_cabletest_do {
-       unsigned char port;
-       unsigned char action;
-} __attribute__((packed));
+static inline struct attr* newAddrAttr (unsigned short attr, struct in_addr value)
+{
+       struct in_addr *v = malloc(sizeof(struct in_addr));
+       
+       *v = value;
+       
+       return newAttr(attr, sizeof(struct in_addr), v);
+}
 
 
-struct attr_cabletest_result {
-       unsigned char port;
-       unsigned int v1;
-       unsigned int v2;
-} __attribute__((packed));
+void freeAttr (struct attr *at);
 
 
-struct attr_vlan_conf {
-       unsigned short vlan;
-       unsigned char ports[0];
-};
+void filterAttributes (List *attr, ...);
 
 
 #endif