Revision 981732fb lib/netutils.py
| b/lib/netutils.py | ||
|---|---|---|
| 490 | 490 |
return address_int |
| 491 | 491 |
|
| 492 | 492 |
|
| 493 |
def FormatAddress(family, address):
|
|
| 493 |
def FormatAddress(address, family=None):
|
|
| 494 | 494 |
"""Format a socket address |
| 495 | 495 |
|
| 496 |
@type family: integer |
|
| 497 |
@param family: socket family (one of socket.AF_*) |
|
| 498 | 496 |
@type address: family specific (usually tuple) |
| 499 | 497 |
@param address: address, as reported by this class |
| 498 |
@type family: integer |
|
| 499 |
@param family: socket family (one of socket.AF_*) or None |
|
| 500 | 500 |
|
| 501 | 501 |
""" |
| 502 |
if family is None: |
|
| 503 |
try: |
|
| 504 |
family = IPAddress.GetAddressFamily(address[0]) |
|
| 505 |
except errors.IPAddressError: |
|
| 506 |
raise errors.ParameterError(address) |
|
| 507 |
|
|
| 502 | 508 |
if family == socket.AF_UNIX and len(address) == 3: |
| 503 | 509 |
return "pid=%s, uid=%s, gid=%s" % address |
| 504 | 510 |
|
Also available in: Unified diff