OSDN Git Service

Merge changes I1c396ab2,Ibf0223cc,Ibe49c873,I6aa1bb98,Ib091831c
authorLorenzo Colitti <lorenzo@google.com>
Thu, 14 Jan 2016 11:31:23 +0000 (11:31 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 14 Jan 2016 11:31:23 +0000 (11:31 +0000)
commit59c72161d70447232ee646d2cb9b756d76db91f3
tree000e0c7ca163c9fe98a0881ee4b2be888d4b8363
parent5ded00750fef41142dc0dcd38664d20947a48bde
parentae33e4e34ae1863e9ab7e3416299c06dc526b902
Merge changes I1c396ab2,Ibf0223cc,Ibe49c873,I6aa1bb98,Ib091831c

* changes:
  Make RTA_METRICS parsing work properly.
  Slightly simplify dumping sockets.
  Support specifying attributes in dump requests.
  Don't run the sock_diag tests twice.
  Test for a SOCK_DIAG oops on IPv4-mapped SYN_RECV connections.