diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2013-07-29 02:11:08 +0200 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2013-07-29 02:11:08 +0200 |
commit | b15c16f12ca6838e5ebefc80c11dcf7933bce8bc (patch) | |
tree | 62e0b4028d99d3ef4aa06a65b8b6379b2fee6cc6 /include | |
parent | 37c21678743c752cbbc2297871c47a3117303309 (diff) | |
download | gmrf-b15c16f12ca6838e5ebefc80c11dcf7933bce8bc.tar gmrf-b15c16f12ca6838e5ebefc80c11dcf7933bce8bc.zip |
Move protocol-specific interface state into iface_t
Diffstat (limited to 'include')
-rw-r--r-- | include/gmrf/gmrf.h | 7 | ||||
-rw-r--r-- | include/mmss/protocol.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/gmrf/gmrf.h b/include/gmrf/gmrf.h index 742848c..19f115a 100644 --- a/include/gmrf/gmrf.h +++ b/include/gmrf/gmrf.h @@ -37,6 +37,7 @@ typedef struct gmrf gmrf_t; typedef struct gmrf_context gmrf_context_t; typedef struct gmrf_iface gmrf_iface_t; +typedef struct gmrf_iface_state gmrf_iface_state_t; #define GMRF_ADDR_LEN 8 @@ -68,7 +69,7 @@ size_t gmrf_iface_get_mtu(gmrf_t *gmrf, gmrf_iface_t *iface); bool gmrf_iface_send(gmrf_t *gmrf, gmrf_iface_t *iface, const void *data, size_t len, const gmrf_addr_t *dest); bool gmrf_iface_send_bc(gmrf_t *gmrf, gmrf_iface_t *iface, const void *data, size_t len); -typedef void (*gmrf_scheduled_func)(gmrf_t *gmrf, gmrf_context_t *ctx, void *arg); +typedef void (*gmrf_scheduled_func)(gmrf_context_t *ctx, void *arg); void gmrf_schedule(gmrf_t *gmrf, gmrf_scheduled_func f, void *arg, unsigned delay); @@ -77,7 +78,7 @@ extern const char *gmrf_protocol_name; extern const char *gmrf_protocol_version; gmrf_context_t* gmrf_protocol_init(gmrf_t *gmrf); -void gmrf_protocol_add_iface(gmrf_t *gmrf, gmrf_context_t *ctx, gmrf_iface_t *iface); -void gmrf_protocol_handle_packet(gmrf_t *gmrf, gmrf_context_t *ctx, gmrf_iface_t *iface, const gmrf_addr_t *source, const void *data, size_t len); +gmrf_iface_state_t* gmrf_protocol_add_iface(gmrf_context_t *ctx, gmrf_iface_t *iface); +void gmrf_protocol_handle_packet(gmrf_context_t *ctx, gmrf_iface_state_t *iface, const gmrf_addr_t *source, const void *data, size_t len); #endif /* _GMRF_GMRF_H_ */ diff --git a/include/mmss/protocol.h b/include/mmss/protocol.h index 3ddd094..277e325 100644 --- a/include/mmss/protocol.h +++ b/include/mmss/protocol.h @@ -35,8 +35,8 @@ typedef struct mmss_protocol { const char* (*get_version)(void); gmrf_context_t* (*init)(gmrf_t *gmrf); - void (*add_iface)(gmrf_t *gmrf, gmrf_context_t *ctx, gmrf_iface_t *iface); - void (*handle_packet)(gmrf_t *gmrf, gmrf_context_t *ctx, gmrf_iface_t *iface, const gmrf_addr_t *source, const void *data, size_t len); + gmrf_iface_state_t* (*add_iface)(gmrf_context_t *ctx, gmrf_iface_t *iface); + void (*handle_packet)(gmrf_context_t *ctx, gmrf_iface_state_t *iface, const gmrf_addr_t *source, const void *data, size_t len); } mmss_protocol_t; #endif /* _GMRF_MMSS_PROTOCOL_H_ */ |