1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Commit Graph

259 Commits

Author SHA1 Message Date
Martin Lenders
529333636e Prepare refactoring 2013-07-29 16:00:42 +02:00
Oleg Hahm
22c668529d Merge branch 'oleg-master' into mymaster
Conflicts:
	cpu/Makefile.include
	cpu/arm_common/arm_cpu.c
2013-07-29 01:36:24 +02:00
Oleg Hahm
f7ecc704a4 fixed includes and include pathes 2013-07-29 01:24:02 +02:00
Oleg Hahm
19e4034ace Merge branch 'thomas-mc1322x'
Conflicts:
	Makefile.modules
	core/kernel_init.c
	core/thread.c
	cpu/arm_common/arm_cpu.c
	cpu/arm_common/syscalls.c
	cpu/lpc_common/hwtimer_cpu.c
	cpu/lpc_common/iap.c
	sys/include/transceiver.h
	sys/net/sixlowpan/sixlowip.c
	sys/net/sixlowpan/sixlowmac.c
	sys/net/sixlowpan/sixlowmac.h
	sys/net/sixlowpan/sixlowpan.c
	sys/transceiver/Makefile
	sys/transceiver/transceiver.c
2013-07-24 23:22:11 +02:00
Oleg Hahm
cce8f46e49 experimental sixlowpan fixes to eliminate multiple definitions 2013-07-24 22:23:21 +02:00
Thomas Eichinger
4bc89bd458 added fixes for compilation for mc1322x 2013-07-24 15:50:16 +02:00
Oleg Hahm
ca75d3c36c fixed some includes 2013-07-24 00:44:28 +02:00
Oleg Hahm
599e266b55 Revert "removed redefined ENABLE_DEBUG"
This reverts commit 69c526f44d.

Instead of removing ENABLE_DEBUG, define it as zero and replacing the
ifdef preprocessor commands by a simple #if
2013-07-24 00:38:43 +02:00
Oleg Hahm
615ddb1eaa some buffer adjustments 2013-07-24 00:02:44 +02:00
Ludwig Ortmann
b29dcc7e89 remove superfluous, commented out puts 2013-07-16 13:50:41 +02:00
Ludwig Ortmann
5c93ff4f65 change puts/printf to DEBUG 2013-07-16 13:50:11 +02:00
Ludwig Ortmann
71ca139be4 translate/fix comments 2013-07-16 13:41:23 +02:00
Oleg Hahm
c989d2147e collected all ICMP type definitions in one header 2013-07-05 09:38:38 +02:00
Oliver Hahm
bf85e4902c Merge branch 'rpl' of ssh://ukleos.org:2222/home/git/ukleos
Conflicts:
	board/msba2-common/tools/src/control_2xxx.c
	drivers/cc110x/cc1100-interface.h
	projects/test_rpl/main.c
	sys/include/vtimer.h
	sys/net/sixlowpan/rpl/Jamfile
	sys/net/sixlowpan/rpl/objective_functions.c
	sys/net/sixlowpan/rpl/objective_functions.h
	sys/net/sixlowpan/rpl/of0.c
	sys/net/sixlowpan/rpl/of0.h
	sys/net/sixlowpan/rpl/rpl.c
	sys/net/sixlowpan/rpl/rpl_dodag.c
	sys/net/sixlowpan/rpl/rpl_structs.h
	sys/net/sixlowpan/rpl/trickle.c
	sys/net/sixlowpan/sixlowmac.c
	sys/vtimer/vtimer.c
2013-06-28 17:53:21 +02:00
Oliver Hahm
57cc002c67 Merge branch 'wsn430'
Conflicts:
	core/include/queue.h
	core/queue.c
	cpu/msp430-common/hwtimer_cpu.c
	cpu/msp430x16x/hwtimer_msp430.c
	sys/lib/hashtable.c
	sys/net/ieee802154/ieee802154_frame.c
	sys/shell/commands/sc_cc110x_ng.c
	sys/transceiver/transceiver.c
	sys/vtimer/vtimer.c
2013-06-25 15:33:40 +02:00
Oliver Hahm
c8bee9e554 fixed coding style (space after most keywords) 2013-06-24 22:37:35 +02:00
Oliver Hahm
79ff4f1cfc updated sixlowpan configuration and minor coding style 2013-06-24 22:12:04 +02:00
Oliver Hahm
f2ec1009af fixed some struct issues (broken by cc fixes) 2013-06-24 14:11:30 +02:00
Oliver Hahm
c1ec60eaf6 * removed rtc from sixlowpan
* fixed some struct issues
2013-06-24 14:10:53 +02:00
Oliver Hahm
1750d5ba0f fixed some struct issues (broken by cc fixes) 2013-06-24 14:09:33 +02:00
Oliver Hahm
5c52e1ce2e coding conventions for most of system libraries 2013-06-22 05:11:53 +02:00
Christian Mehlis
d4ea8664ee add missing ; 2013-06-14 20:37:39 +02:00
Christian Mehlis
5d587e34eb fix sixlowpan includes 2013-06-14 20:37:07 +02:00
Christian Mehlis
a66a193f99 fix printf pattern 2013-06-14 20:36:31 +02:00
Christian Mehlis
3ab669578c do includes the right way (for riot includes) 2013-06-14 20:33:28 +02:00
Oliver Hahm
fdd1d21e8d Merge branch 'master' into wsn430 2013-06-14 19:41:23 +02:00
Christian Mehlis
4d8783e023 use out parameter for vtimer_now 2013-06-13 10:23:47 +02:00
Martin
032ba13938 fix ICMP type is DIS 2013-06-10 17:39:11 +02:00
Martin
43255ff855 fix warnings due to unapropriate prototypes 2013-06-10 17:36:56 +02:00
Milan Babel
2f5ed66756 created own module for ieee802154
this is needed to include the ieee802154 in drivers without the hole sixlowpan
2013-06-06 08:35:17 +02:00
Stephan Arndt
d9c9f38c61 integrated ETX calculation with RPL, rpl messages seem to not get handled very often 2013-03-29 13:41:48 +01:00
Stephan Arndt
1fd9325d8c switched DEBUG mode off 2013-03-28 17:40:01 +01:00
Stephan Arndt
60c594b852 Deleted ETX structs in rpl_structs and added them in etx_beaconing.h
changed packet size sent to be fix and not variable
changed some array sizes if debug is enabled
2013-03-28 17:11:12 +01:00
Stephan Arndt
b22e80b806 Fixed ETX calculations 2013-03-28 15:27:30 +01:00
Stephan Arndt
7e54f7ea5f improved handling of etx-messages 2013-03-24 20:03:18 +01:00
Stephan Arndt
2ae2d85b10 changed some buffer sizes and other minimal stuff 2013-03-24 15:57:52 +01:00
Stephan Arndt
85211f8408 changed some of the ETX constants to be more easily understandable 2013-03-22 18:37:00 +01:00
Stephan Arndt
dccc377f83 Changed value for maximum candidate neighbors to 40
Replaced lots of different constants written as numbers  by proberply defined constant-variables
 Changed usage of fixed values for the hwtimer_wait in send_beacon to customizable constants
2013-03-22 17:40:36 +01:00
Stephan Arndt
c161b43d78 changed some printf statements into puts 2013-03-19 14:07:31 +01:00
Stephan Arndt
07a7f10798 changed buffer sizes for debugging 2013-03-19 14:04:23 +01:00
Stephan Arndt
5a2bc468c4 threads dont overflow anymore, still hangs at random counts of sent beacon packets 2013-03-18 19:22:07 +01:00
Benjamin Valentin
4d73d17662 add Makefiles to sys/net 2013-03-16 17:27:27 +01:00
Stephan Arndt
adfc3306ab WARNING: BROKEN COMMIT added not working etx_beaconing into rpl, added small vtimer debug changes, changed cc1100 default mode 2013-03-15 17:48:13 +01:00
Stephan Arndt
e8256783f4 added etx_beaconing files 2013-03-03 17:47:11 +01:00
Oleg Hahm
d31ee82518 * removed legacy projects folder and Jamfiles 2013-02-27 19:08:16 +01:00
Stephan Arndt
31b65059a8 preparing for changing how parent selection/updates work in rpl, since the way it is implemented now goes against the spec 2013-02-21 18:25:35 +01:00
Stephan Arndt
644d6de364 changed rank calculation in OF0 and some other things. WARNING: this commit might break the rpl implementation for now, if a rollback is needed, choose an earlier commit than this 2013-02-21 18:23:36 +01:00
Stephan Arndt
e0a21b9ddd added comments onto structs for easier findings in RFC 2013-02-13 15:03:16 +01:00
Stephan Arndt
91b023df4b deleted fake rounting entries which had been commented out 2013-02-13 15:02:21 +01:00
Stephan Arndt
567be35fc4 startet implementation of objective function mrhof 2013-02-13 15:00:43 +01:00
Stephan Arndt
39482f7316 deleted empty files objective_functions.c/h 2013-02-13 14:59:15 +01:00
Stephan Arndt
812dafde77 deleted unused 'old_main' function 2012-12-04 15:12:12 +01:00
Oliver Hahm
9b961d6591 [sys net sixlowpan]
* fixed some line endings from dos to unix style
2012-11-05 16:29:11 -05:00
Eric Engel
870b10514f Changed some Parameters of RPL
Added Loop Function in rpl_test project
send DAOs regular
2012-04-07 20:30:13 +02:00
Oliver Hahm
e9cdacbf51 [projects test_rpl] [sys net sixlowpan rpl]
* removed vtimer_init from rpl_init
 * some transceiver watchdog workaround foobar
2012-03-29 16:27:20 +02:00
Oliver Hahm
7397d98f8a [projects test_rpl] [sys net sixlowpan] [sys transceiver]
* some debugging
* increased timeout
2012-03-28 17:30:59 +02:00
Eric Engel
f7368395ff only 10 DAO trys and unrecognized options now directly lead to abort 2012-03-27 22:18:35 +02:00
Eric Engel
a70a33337e RPL Finished, fixed some bugs, changed printf to puts, Use of Link Local addresses in RPL 2012-03-27 17:56:47 +02:00
Eric Engel
edbef27d29 Changed sixlowpan send buffers to any possible buffers, added some mutexes 2012-03-26 00:04:21 +02:00
Eric Engel
88e79185c4 Trickle corrections, changed some Stack sizes 2012-03-12 16:22:52 +01:00
Eric Engel
f15840da9b Only one packet sent 2012-03-06 11:08:16 +01:00
Eric Engel
6dbec3b0ae various changes 2012-03-02 20:22:22 +01:00
Oliver
d6f0e9c3dc [projects tlayer]
- adjusted thread stack sizes to more realistic value

[projects sixlowpan]
- adapted sixlowpan API change

[sys net sixlowpan]
- adjusted thread stack sizes to more realistic value

[sys net destiny]
- adjusted thread stack sizes to more realistic value
2012-03-01 02:48:22 +01:00
Eric Engel
f85d1968c4 RPL Routing finished 2012-02-26 19:30:48 +01:00
Eric Engel
f69fbfd686 rpl nearly finished, rpl_test now with shell 2012-02-22 00:50:40 +01:00
Oliver
9ca8afd70c [ sys net sixlowpan ]
- fixed a bug in 6LoWPAN reassembly algorithm where in a specific case a
pointer could be used although it is NULL
- removed MAC routing
- added IP routing
2012-02-20 04:25:52 +01:00
Eric Engel
e6e336c77f Now sending DAOs, added DIS handling 2012-02-16 23:23:15 +01:00
Eric Engel
d766e41996 Joined nodes now send DIOs, some minor bugfixes, routing table stubs 2012-02-14 22:22:01 +01:00
Oliver
f57e4078e5 [sys net sixlowpan]
- HACK: added simple static MESH routing on MAC layer, see
projects/tlayer/main.c for explanation and usage.
2012-02-14 21:28:51 +01:00
Oliver
8a886fae25 [sys net destiny]
- fixed a bug where a retransmitted TCP ACK segment did not contain the
ACK flag

[sys net sixlowpan]
- changed sixlowpan architecture: IPV6 packets now always get stored in
sixlowpan (reassembly) buffer and are transmitted one after the other 
(FIFO) to IPV6 layer via a separate transfer thread
2012-02-13 23:31:17 +01:00
Oliver
ee34ac4375 [sys net destiny]
- fixed handling of duplicate tcp segments (tcp_hc and regular)
- few general bugfixes
2012-02-07 04:24:00 +01:00
Oliver
ec900bc5f5 [sys net destiny]
- fixed a lot of bugs in tcp header compression algorithms
2012-02-05 00:33:55 +01:00
Eric Engel
6491312b98 Added trickle Algorithm 2012-02-02 21:31:28 +01:00
Oliver
7c293f82e4 [sys net destiny]
- added tcp_hc compress handling
2012-02-02 02:41:39 +01:00
Eric Engel
d10136aec5 [sys net sixlowpan rpl] Beim erhalt von DIO Nachrichten wird Dodags beigetreten, parents werden hinzugefügt, globale Reperatur wird getriggert 2012-01-31 19:36:26 +01:00
Oliver
1465da2e84 [projects tlayer]
- Added: Close_TCP, TCP_Performance test, UDP_Performance test

[sys net destiny]
- bugfixes
- Added: Simultaneous close, Memory protection for tcp timer thread

[sys net sixlowpan]
- Added: separate sending buffer (just a HACK workaround!)
2012-01-30 22:44:38 +01:00
Eric Engel
445fb4450f Corrected Jamfiles, no more direct call of rpl functions from sixlowip 2012-01-26 20:26:55 +01:00
Oliver
f92299c523 [sys net destiny]
- changed architecture to tcp control block struct
2012-01-25 03:38:22 +01:00
Oliver
75514e30b8 [sys net net_help]
- removed net_msg_FUNCTION ID Handling in favor of function commands

[sys net destiny]
- added TCP Connect Timeout and retry handling
2012-01-24 03:19:11 +01:00
Oliver Hahm
1f09cfce9e Merge branch 'master' of ssh://ukleos/home/git/ukleos 2012-01-20 17:44:24 +01:00
Oliver Hahm
b360d53577 [sys net sixlowpan]
* added missing rtc module to Jamfile
2012-01-20 17:43:57 +01:00
Eric Engel
f54436afd7 fixed wrong flag value 2012-01-19 17:46:07 +01:00
Eric Engel
f3ec877def added incomplete rpl 2012-01-19 17:37:48 +01:00
Eric Engel
550c829f0d added incomplete rpl 2012-01-19 17:35:50 +01:00
Oliver Hahm
59a46e0e88 Merge branch 'sixlowpan'
Conflicts:
	cpu/arm_common/hwtimer_cpu.c
	sys/include/vtimer.h
	sys/vtimer.c
2012-01-11 17:02:43 +01:00
Oliver
15fab8e0cc - set TCP MTU to more realistic value
- Implemented TCP SOCKET API close()
- minor bugfixes
2012-01-03 02:16:43 +01:00
Oliver
436d977275 - Added Timeout handling when reassembling 6LoWPAN fragments 2011-12-27 03:04:41 +01:00
Oliver
11fecd089e - Added dynamic 6LoWPAN fragment buffer for reassembly of multiple
fragments at the same time
- Introduced thread message wrappers for identifying the correct
function
- Several bugfixes
2011-12-26 02:59:58 +01:00
Oliver
ae7d26382e NEW features: recv(); for TCP, TCP ACKs for data, introduced
net_msg_*() helper functions,
fixed lots of bugs
2011-11-25 01:31:54 +01:00
Oliver
7d1f607f0f Socket API: Code cleanup, small bugfixes 2011-11-02 02:55:38 +01:00
Oliver
c1b2b10a06 UDP bug fixes: after using TCP connection, socket was not deleted
properly
2011-11-01 21:04:28 +01:00
Oliver
fecb514293 Major bug fixes in TCP socket API and TCP packet handler. 2011-11-01 05:47:28 +01:00
Oliver
9e20944fde new socket API functions, added TCP Handler, introduced global network
helper, increased stack sizes of network threads
2011-10-13 04:31:07 +02:00
Oliver Gesch
d9ff08b23a new, DESTiny: UDP Transport Layer and UDP part of Socket API 2011-09-28 16:29:01 +02:00
mlenders
5e6c25b511 Removed Escaping of '\r' 2011-08-05 17:17:12 +02:00
mlenders
3862e2b894 Merge branch 'sixlowpan' of ssh://ukleos.imp.fu-berlin.de/home/git/ukleos into sixlowpan 2011-08-05 16:11:07 +02:00
mlenders
19dc26b496 [*]
* reserved to empty in serial frames
2011-08-05 15:45:38 +02:00
mlenders
22b2690271 [sys/net/sixlowpan/flowcontrol.h]
* Window sizes to 1
2011-07-28 18:26:56 +02:00
mlenders
f40ed36802 [sys/net/sixlowpan/flowcontrol.*]
* fixed sem_init()
2011-07-28 18:25:57 +02:00
mlenders
c6c5eaae70 Fixed readpacket 2011-07-27 19:43:51 +02:00