Almost working

Udp recording: ok
TCP recording : total fail
Merge from Nico