abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-05-16 13:16:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Work on patch #9044: SNMP response for failed get operation

Browse Source 
Inspired by Marco Veeneman. Change signature of get_value function to return s16_t, where values <0 indicate an error. This is mapped to SNMP_ERR_GENERROR.
This commit is contained in:
Dirk Ziegelmeier
2016-07-26 12:48:31 +02:00
parent 168ad22761
commit a62e4452a2
15 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/lwip/apps/snmp_core.h
View File

@@ -181,7 +181,7 @@ typedef enum {
struct snmp_node_instance;
typedef u16_t (*node_instance_get_value_method)(struct snmp_node_instance*, void*);
typedef s16_t (*node_instance_get_value_method)(struct snmp_node_instance*, void*);
typedef snmp_err_t (*node_instance_set_test_method)(struct snmp_node_instance*, u16_t, void*);
typedef snmp_err_t (*node_instance_set_value_method)(struct snmp_node_instance*, u16_t, void*);
typedef void (*node_instance_release_method)(struct snmp_node_instance*);
@@ -201,7 +201,7 @@ struct snmp_node_instance
/** one out of instance access types defined above (SNMP_NODE_INSTANCE_READ_ONLY,...) */
snmp_access_t access;
/** returns object value for the given object identifier */
/** returns object value for the given object identifier. Return values <0 to indicate an error */
node_instance_get_value_method get_value;
/** tests length and/or range BEFORE setting */
node_instance_set_test_method set_test;

2
src/include/lwip/apps/snmp_scalar.h
View File

@@ -79,7 +79,7 @@ struct snmp_scalar_array_node_def
snmp_access_t access;
};
typedef u16_t (*snmp_scalar_array_get_value_method)(const struct snmp_scalar_array_node_def*, void*);
typedef s16_t (*snmp_scalar_array_get_value_method)(const struct snmp_scalar_array_node_def*, void*);
typedef snmp_err_t (*snmp_scalar_array_set_test_method)(const struct snmp_scalar_array_node_def*, u16_t, void*);
typedef snmp_err_t (*snmp_scalar_array_set_value_method)(const struct snmp_scalar_array_node_def*, u16_t, void*);

6
src/include/lwip/apps/snmp_table.h
View File

@@ -121,9 +121,9 @@ snmp_err_t snmp_table_simple_get_next_instance(const u32_t *root_oid, u8_t root_
snmp_table_simple_get_next_instance }, \
(u16_t)LWIP_ARRAYSIZE(columns), (columns), (get_cell_value_method), (get_next_cell_instance_and_value_method) }
u16_t snmp_table_extract_value_from_s32ref(struct snmp_node_instance* instance, void* value);
u16_t snmp_table_extract_value_from_u32ref(struct snmp_node_instance* instance, void* value);
u16_t snmp_table_extract_value_from_refconstptr(struct snmp_node_instance* instance, void* value);
s16_t snmp_table_extract_value_from_s32ref(struct snmp_node_instance* instance, void* value);
s16_t snmp_table_extract_value_from_u32ref(struct snmp_node_instance* instance, void* value);
s16_t snmp_table_extract_value_from_refconstptr(struct snmp_node_instance* instance, void* value);
#endif /* LWIP_SNMP */

2
src/include/lwip/apps/snmp_threadsync.h
View File

@@ -58,7 +58,7 @@ struct threadsync_data
{
union {
snmp_err_t u8;
u16_t u16;
s16_t s16;
} retval;
union {
const u32_t *root_oid;