Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity

Nicer port specification for pathoc

Browse Source
This commit is contained in:
Aldo Cortesi 2014-10-25 16:34:19 +13:00
parent 6d8431ab3e
commit 384abbfdd5
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libpathod/cmdline.py
View File

@ -38,23 +38,20 @@ def go_pathoc():
"-n", dest='repeat', default=1, type=int, metavar="N", "-n", dest='repeat', default=1, type=int, metavar="N",
help='Repeat requests N times' help='Repeat requests N times'
) )
parser.add_argument(
"-p", dest="port", type=int, default=None,
help="Port. Defaults to 80, or 443 if SSL is active"
)
parser.add_argument( parser.add_argument(
"-t", dest="timeout", type=int, default=None, "-t", dest="timeout", type=int, default=None,
help="Connection timeout" help="Connection timeout"
) )
parser.add_argument( parser.add_argument(
'host', type=str, 'host', type=str,
help='Host to connect to' metavar = "host[:port]",
help='Host and port to connect to'
) )
parser.add_argument( parser.add_argument(
'request', type=str, nargs="+", 'request', type=str, nargs="+",
help=""" help="""
Request specification, or path to a file containing a request Request specification, or path to a file containing request
specifcation specifcations
""" """
) )
group = parser.add_argument_group( group = parser.add_argument_group(
@ -127,10 +124,18 @@ def go_pathoc():
args = parser.parse_args() args = parser.parse_args()
args.port = None
if ":" in args.host:
h, p = args.host.rsplit(":", 1)
try:
p = int(p)
except ValueError:
parser.error("Invalid port in host spec: %s" % args.host)
args.host = h
args.port = p
if args.port is None: if args.port is None:
args.port = 443 if args.ssl else 80 args.port = 443 if args.ssl else 80
else:
args.port = args.port
try: try:
args.ignorecodes = [int(i) for i in args.ignorecodes.split(",") if i] args.ignorecodes = [int(i) for i in args.ignorecodes.split(",") if i]