Multiple destinations option added

Multiple destinations via the -d option can be set:

python nb_send.py -d 127.0.0.1 -d 127.0.0.2 -s
This commit is contained in:
Alexandre Dulaunoy 2013-06-08 10:00:12 +02:00
parent 74663a39f7
commit e5121985cc

View file

@ -43,7 +43,7 @@ parser = OptionParser(usage)
parser.add_option("-p","--psk", dest="psk", help="pre-shared key used by the HMAC-SHA1 (default: netbeacon)") parser.add_option("-p","--psk", dest="psk", help="pre-shared key used by the HMAC-SHA1 (default: netbeacon)")
parser.add_option("-s","--storeseq", dest="storeseq", action='store_true', help="store sequence and validate sequence") parser.add_option("-s","--storeseq", dest="storeseq", action='store_true', help="store sequence and validate sequence")
parser.add_option("-i","--iteration", dest="iteration", type=int, help="set the number of interation for sending the netbeacon") parser.add_option("-i","--iteration", dest="iteration", type=int, help="set the number of interation for sending the netbeacon")
parser.add_option("-d","--destination", dest="destination", help="set the destination IPv4 address (default: 127.0.0.1)") parser.add_option("-d","--destination", dest="destinations", action="append", help="set the destination(s) IPv4 address (default: 127.0.0.1)")
parser.add_option("-v","--verbose", dest="verbose", action='store_true', help="output netbeacon sent") parser.add_option("-v","--verbose", dest="verbose", action='store_true', help="output netbeacon sent")
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
@ -52,27 +52,34 @@ if options.psk:
else: else:
psk = "netbeacon" psk = "netbeacon"
destinations = []
if not options.destinations:
destinations.append("127.0.0.1")
else:
for v in options.destinations:
destinations.append(v)
if options.storeseq: if options.storeseq:
import shelve import shelve
s = shelve.open("netbeacon-send.seq") s = shelve.open("netbeacon-send.seq")
if 'seq' not in s: for destination in destinations:
s['seq'] = 1 k = 'seq:' + str(destination)
seqstart = s['seq'] print (k)
else: if k not in s:
seqstart = s['seq'] s[k] = 1
seqstart = s[k]+1
else: else:
seqstart = 1 seqstart = 1
if not options.iteration: if not options.iteration:
options.iteration=10 options.iteration=10
if not options.destination: for destination in destinations:
options.destination="127.0.0.1" for x in range(seqstart,seqstart+options.iteration):
nbsend(destination=destination, payload=nbmessage(x, psk=psk), logging=options.verbose)
for x in range(seqstart,seqstart+options.iteration):
nbsend(destination=options.destination, payload=nbmessage(x, psk=psk), logging=options.verbose)
if options.storeseq: if options.storeseq:
s['seq'] = x s['seq:'+str(destination)] = x
if options.storeseq: if options.storeseq:
s.close() s.close()