merge with inet-framework
fix memory leak
Merge with inet-framework
fix headers