diff --git a/examples/simple/datagram/thr_compile.sh b/examples/simple/datagram/thr_compile.sh
index e670c5dc792f2aa1c998e5e19575ecfab3f7ebef..bd8569f87b74f4f45070fd4ef39d0c675890eb22 100644
--- a/examples/simple/datagram/thr_compile.sh
+++ b/examples/simple/datagram/thr_compile.sh
@@ -2,3 +2,4 @@
(cd ..; sh compile.sh)
gcc -o thr_example -L ../../../lib/c -I . -I .. -I ../../../lib/c -I ../../../lib/c/experimental thr_example.c ../gen/simple.c -llabcomm
+gcc -o thr_example2 -L ../../../lib/c -I . -I .. -I ../../../lib/c -I ../../../lib/c/experimental thr_example2.c ../gen/simple.c -llabcomm
diff --git a/examples/simple/datagram/thr_example2.c b/examples/simple/datagram/thr_example2.c
new file mode 100644
index 0000000000000000000000000000000000000000..74f752c47a492df5efde37dfaf9791f0b57b6773
--- /dev/null
+++ b/examples/simple/datagram/thr_example2.c
@@ -0,0 +1,150 @@
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <labcomm_thr_reader_writer.h>
+#include "gen/simple.h"
+#include "ThrottleDrv/throttle_drv.h"
+
+
+
+static void handle_simple_TwoInts_foo(simple_TwoInts *v,void *context) {
+ unsigned char *src = get_sender_addr((struct thr_chn_t *)context);
+ printf("Got TwoInts. a=%d, b=%d\n", v->a, v->b);
+ printf("... src addr: %x:%x:%x:%x:%x:%x\n", src[0], src[1], src[2], src[3], src[4], src[5]);
+}
+
+static int encode(int argc, char *argv[]) {
+ struct thr_chn_t *p_thr_chn = NULL;
+ struct thr_chn_t *p_thr_chn2 = NULL;
+ struct labcomm_encoder *encoder;
+ struct labcomm_decoder *decoder;
+ int i, j;
+// unsigned char dest_mac[ETH_ADR_SIZE] = {0x00, 0x09, 0x6b, 0x10, 0xf3, 0x80}; /* other host MAC address, hardcoded...... :-( */
+ unsigned char dest_mac[ETH_ADR_SIZE] = {0x00, 0x09, 0x6b, 0xe3, 0x81, 0xbf}; /* other host MAC address, hardcoded...... :-( */
+ unsigned char chn_id = 0x01;
+ unsigned short frag_size = 60;
+ unsigned short freq = 1000; /* milliseconds */
+
+ char *ifname = argv[1];
+ char *dest_mac_str = argv[2];
+
+ if(parse_MAC_address(dest_mac_str, dest_mac)) {
+ printf("failed to parse dest MAC address\n");
+ return 1;
+ }
+
+ if (-1 == thr_init(ifname))
+ {
+ printf("Throttle Init failure.");
+ }
+ else
+ {
+ p_thr_chn = thr_open_chn(dest_mac, chn_id, frag_size, freq,NULL);
+ p_thr_chn2 = thr_open_chn(dest_mac, 17, frag_size, 100,(thr_msg_handler_t)labcomm_decoder_decode_one);
+ encoder = labcomm_encoder_new(labcomm_thr_writer, p_thr_chn);
+ labcomm_encoder_register_simple_TwoInts(encoder);
+ labcomm_encoder_register_simple_IntString(encoder);
+ decoder = labcomm_decoder_new(labcomm_thr_reader, p_thr_chn2);
+ if (!decoder)
+ {
+ printf("Failed to allocate decoder %s:%d\n", __FUNCTION__, __LINE__);
+ return 1;
+ }
+ labcomm_decoder_register_simple_TwoInts(decoder, handle_simple_TwoInts_foo, p_thr_chn2);
+
+ int ret;
+ unsigned char data[200];
+ simple_IntString is;
+ is.x = 24;
+ is.s = "Hello, LabComm!";
+ printf("Encoding IntString, x=%d, s=%s\n", is.x, is.s);
+ labcomm_encode_simple_IntString(encoder, &is);
+
+ simple_TwoInts ti;
+ ti.a = 13;
+ ti.b = 37;
+ printf("Encoding TwoInts, a=%d, b=%d\n", ti.a, ti.b);
+ labcomm_encode_simple_TwoInts(encoder, &ti);
+ printf("Decoding:\n");
+ thr_receive(p_thr_chn2, data, decoder);
+ thr_receive(p_thr_chn2, data, decoder);
+
+ labcomm_encoder_free(encoder);
+ labcomm_decoder_free(decoder);
+ thr_close_chn(p_thr_chn);
+ thr_close_chn(p_thr_chn2);
+ //client_exit(fd);
+ }
+}
+
+static void handle_simple_TwoInts(simple_TwoInts *v,void *context) {
+ unsigned char *src = get_sender_addr((struct thr_chn_t *)context);
+ printf("Got TwoInts. a=%d, b=%d\n", v->a, v->b);
+ printf("... src addr: %x:%x:%x:%x:%x:%x\n", src[0], src[1], src[2], src[3], src[4], src[5]);
+ struct thr_chan_t *ch = thr_open_chn(src, 17, (unsigned short)50, (unsigned short)100, NULL);
+ struct labcomm_encoder *enc = labcomm_encoder_new(labcomm_thr_writer, ch);
+ labcomm_encoder_register_simple_TwoInts(enc);
+ v->a *= 2;
+ v->b *= 3;
+ labcomm_encode_simple_TwoInts(enc, v);
+ labcomm_encoder_free(enc);
+ thr_close_chn(ch);
+}
+
+static void handle_simple_IntString(simple_IntString *v,void *context) {
+ printf("Got IntString. x=%d, s=%s\n", v->x, v->s);
+ unsigned char *src = get_sender_addr((struct thr_chn_t *)context);
+ printf("... src addr: %x:%x:%x:%x:%x:%x\n", src[0], src[1], src[2], src[3], src[4], src[5]);
+}
+
+static int decode(int argc, char *argv[]) {
+ struct thr_chn_t *p_thr_chn = NULL;
+ struct labcomm_decoder *decoder;
+ unsigned char dest_mac[ETH_ADR_SIZE] = {0x00, 0x09, 0x6b, 0x10, 0xf3, 0x80}; /* other host MAC address, hardcoded...... :-( */
+ int ret = 0;
+ unsigned char chn_id = 0x01;
+ unsigned short frag_size = 60;
+ unsigned short freq = 1000; /* milliseconds */
+ unsigned char data[200];
+
+ char *ifname = argv[1];
+ if (-1 == thr_init(ifname))
+ {
+ printf("Throttle Init failure.");
+ }
+ else
+ {
+ p_thr_chn = thr_open_chn(dest_mac, chn_id, frag_size, freq, (thr_msg_handler_t)labcomm_decoder_decode_one);
+ decoder = labcomm_decoder_new(labcomm_thr_reader, p_thr_chn);
+ if (!decoder)
+ {
+ printf("Failed to allocate decoder %s:%d\n", __FUNCTION__, __LINE__);
+ return 1;
+ }
+ labcomm_decoder_register_simple_TwoInts(decoder, handle_simple_TwoInts, p_thr_chn);
+ labcomm_decoder_register_simple_IntString(decoder, handle_simple_IntString, p_thr_chn);
+
+ printf("Decoding:\n");
+ do {
+ ret = thr_receive(p_thr_chn, data, decoder);
+ } while(-1 != ret);
+ {
+ printf("Throttle Send receive failure.");
+ }
+ printf("--- End Of File ---:\n");
+ labcomm_decoder_free(decoder);
+
+ //server_exit(fd);
+ }
+}
+
+int main(int argc, char *argv[]) {
+ if(argc == 2) {
+ return decode(argc, argv);
+ } else if(argc == 3) {
+ return encode(argc, argv);
+ } else {
+ printf("Usage: For encoding ethN xx:xx:xx:xx:xx:xx\n For decoding ethN\n where ethN is the ethernet interface to use\n and xx:xx:...:xx is the destination MAC address");
+ return 1;
+ }
+}
diff --git a/lib/c/experimental/ThrottleDrv/throttle_drv.c b/lib/c/experimental/ThrottleDrv/throttle_drv.c
index 2c34cee263bd9db684268598923e2893a111ade9..5852d7306cba2dccc0c1faef1a4887d3e2a1a945 100644
--- a/lib/c/experimental/ThrottleDrv/throttle_drv.c
+++ b/lib/c/experimental/ThrottleDrv/throttle_drv.c
@@ -40,6 +40,7 @@ struct thr_chn_t
thr_msg_handler_t funct; /* Callback function invoked at the reception */
unsigned short msg_length;
unsigned char* p_msg;
+ unsigned char last_sender_adr[ETH_ADR_LEN];/* src MAC address of last message */
};
/* Type for the Throttle message */
@@ -142,6 +143,9 @@ struct thr_chn_t* thr_open_chn(const unsigned char* dst_adr, unsigned char chn_i
return(tmp_chn);
}
+void thr_close_chn(struct thr_chn_t* c){
+ free(c);
+}
/**
* @fn int thr_send(const struct thr_chn_t* thr_chn, const char* data, unsigned int length)
@@ -317,6 +321,7 @@ int thr_receive(struct thr_chn_t* thr_chn, unsigned char* data, void* param)
#endif
thr_chn->msg_length = ret;
memcpy(thr_chn->p_msg, data, ret); /* copy the msg into the thr structure */
+ memcpy(thr_chn->last_sender_adr, THR_MSG_SRC_ADR(thr_msg), 6); /* ... and the address of the sender */
#ifdef DEBUG
printf("thr_receive: calling %x\n", thr_chn->funct);
#endif
@@ -395,3 +400,7 @@ int thr_read(struct thr_chn_t* thr_chn, unsigned char* data, int length)
}
return(ret);
}
+
+unsigned char* get_sender_addr(struct thr_chn_t* ch) {
+ return ch->last_sender_adr;
+}
diff --git a/lib/c/experimental/ThrottleDrv/throttle_drv.h b/lib/c/experimental/ThrottleDrv/throttle_drv.h
index 567c36d39ef3fe404ceb21facf9fa69514f27528..e231ba0a7f36ed8df24a9555cb4ab0d9507110b7 100644
--- a/lib/c/experimental/ThrottleDrv/throttle_drv.h
+++ b/lib/c/experimental/ThrottleDrv/throttle_drv.h
@@ -10,8 +10,10 @@ struct thr_chn_t;
int thr_init(const char* eth_int);
struct thr_chn_t* thr_open_chn(const unsigned char* dst_adr, unsigned char chn_id, unsigned char frag_size, unsigned short freq, thr_msg_handler_t funct);
+void thr_close_chn(struct thr_chn_t* c);
int thr_receive (struct thr_chn_t* thr_chn, unsigned char* data, void* param);
int thr_send(const struct thr_chn_t* thr_chn, const char* data, unsigned int length);
int thr_read(struct thr_chn_t* thr_chn, unsigned char* data, int length);
+unsigned char* get_sender_addr(struct thr_chn_t* ch);
#endif