From: Sage Weil Date: Mon, 13 Aug 2018 13:48:14 +0000 (-0500) Subject: Merge PR #22879 into master X-Git-Tag: v14.0.1~601 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8f3560d4ed461ad2d64bc586f2ffd1b39701bfe7;p=ceph.git Merge PR #22879 into master * refs/pull/22879/head: doc/rados/operations/user-management: document 'network' clause of moncap and osdcap mds/SessionMap: make Session::connection private mds/MDSAuthCaps: parse and enforce network restriction mds/MDSAuthCaps: pass addr to is_capable mds/SessionMap: track socket_addr for each Session osd/OSDCap: enforce network restriction osd/OSDCap: take addr arg to is_capable osd/OSDCap: parse 'network' clause in grant mon: adapt MonCap network checks to addrvecs mon/MonCap: enforce network constraint (if present) mon/MonCap: take addr for MonCap::is_capable mon/MonCap: parse 'network ...' suffix osd: add peer_socket_addr to Session mon: use addrvec for RoutedRequest and MForward msg/Connection: add get_peer_socket_addr() common/ipaddr: add network_contains() helper common/ipaddr: add parse_network helper common/ipaddr: expose netmask_ipv[46] Reviewed-by: Gregory Farnum Reviewed-by: Greg Farnum --- 8f3560d4ed461ad2d64bc586f2ffd1b39701bfe7