Hi, Since I made 4 commits in the branch, I send them as attachments.
Best regards, Can Zhang
0001-ip-address-presentation-convert-helper-methods.patch
Description: Binary data
0002-ip-address-presentation-convert-helper-methods.patch
Description: Binary data
0003-method-name-changes-to-conform-with-ryu-convention.patch
Description: Binary data
0004-add-test-method-name-change.patch
Description: Binary data
On Apr 16, 2013, at 1:54 AM, FUJITA Tomonori <[email protected]> wrote: > On Fri, 12 Apr 2013 15:44:04 +0800 > Can Zhang <[email protected]> wrote: > >> --- /dev/null 2013-04-12 15:25:34.000000000 +0800 >> +++ ip.py 2013-04-12 15:40:33.000000000 +0800 >> @@ -0,0 +1,70 @@ >> +import struct >> + >> + >> +def ipv4_arg_to_bin(w, x, y, z): >> + """Generate unsigned int from components of IP address >> + returns: w << 24 | x << 16 | y << 8 | z""" >> + return (w << 24) | (x << 16) | (y << 8) | z >> + >> + >> +def ipv4_to_bin(ip): >> + ''' >> + Parse an IP address and return an unsigned int. >> + The IP address is in dotted decimal notation. >> + ''' >> + args = [int(arg) for arg in ip.split('.')] >> + return ipv4_arg_to_bin(*args) >> + >> + >> +def ipv4_to_str(ip): >> + """Generate IP address string from an unsigned int. >> + ip: unsigned int of form w << 24 | x << 16 | y << 8 | z >> + returns: ip address string w.x.y.z""" >> + w = (ip >> 24) & 0xff >> + x = (ip >> 16) & 0xff >> + y = (ip >> 8) & 0xff >> + z = ip & 0xff >> + return "%i.%i.%i.%i" % (w, x, y, z) >> + >> +IPV6_PACK_STR = '!8H' >> + >> + >> +def ipv6_to_arg_list(ipv6): >> + ''' >> + convert ipv6 string to a list of 8 different parts >> + ''' >> + args = [] >> + if '::' in ipv6: >> + h, t = ipv6.split('::') >> + h_list = [int(x, 16) for x in h.split(':')] >> + t_list = [int(x, 16) for x in t.split(':')] >> + args += h_list >> + zero = [0] >> + args += ((8 - len(h_list) - len(t_list)) * zero) >> + args += t_list >> + else: >> + args = [int(x, 16) for x in ipv6.split(':')] >> + >> + return args >> + >> + >> +def ipv6_to_bin(ipv6): >> + ''' >> + convert ipv6 string to binary representation >> + ''' >> + args = ipv6_to_arg_list(ipv6) >> + return struct.pack(IPV6_PACK_STR, *args) >> + >> + >> +def bin_to_ipv6(bin_addr): >> + ''' >> + convert binary representation to human readable string >> + ''' >> + args = struct.unpack_from(IPV6_PACK_STR, bin_addr) >> + return ':'.join('%x' % x for x in args) >> + >> +if __name__ == '__main__': >> + a = ipv4_to_bin('10.28.197.1') >> + print ipv4_to_str(a) >> + print bin_to_ipv6(ipv6_to_bin('3f:10::1:2')) >> + print bin_to_ipv6(ipv6_to_bin('2013:da8:215:8f2:aa20:66ff:fe4c:9c3c')) > > Please put the testing code into tests directory. > > Also please use 'git format-patch' to generate a patch. > > Thanks!
------------------------------------------------------------------------------ Precog is a next-generation analytics platform capable of advanced analytics on semi-structured data. The platform includes APIs for building apps and a phenomenal toolset for data science. Developers can use our toolset for easy data analysis & visualization. Get a free account! http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
