mark struct type, const
Merge branch 'feature/socket' into develop

* feature/socket:
  mark struct type, const