Refactor directories; add unit tests; add router keyword (fcf7bfe2) · Commits · The Tor Project / Core / Tor

src/common/test.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@
		char v1=(expr1), v2=(expr2); \
		if(!strcmp(v1,v2)) { printf("."); } else { \
		printf("\nFile %s: line %d (%s): Assertion failed: (%s==%s)\n"\
		" (%s != %s)\n", \
		" (\"%s\" != \"%s\")\n", \
		__FILE__, \
		__LINE__, \
		__PRETTY_FUNCTION__, \
		@@ -77,7 +77,7 @@
		char v1=(expr1), v2=(expr2); \
		if(strcmp(v1,v2)) { printf("."); } else { \
		printf("\nFile %s: line %d (%s): Assertion failed: (%s!=%s)\n"\
		" (%s == %s)\n", \
		" (\"%s\" == \"%s\")\n", \
		__FILE__, \
		__LINE__, \
		__PRETTY_FUNCTION__, \

src/config/dirservers

+3 −3

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		# DirPort is where the router listens for directory download requests

		# Router 1
		moria.mit.edu 9001 9011 9021 9031 1000000
		router moria.mit.edu 9001 9011 9021 9031 1000000
		-----BEGIN RSA PUBLIC KEY-----
		MIGJAoGBAMBBuk1sYxEg5jLAJy86U3GGJ7EGMSV7yoA6mmcsEVU3pwTUrpbpCmwS
		7BvovoY3z4zk63NZVBErgKQUDkn3pp8n83xZgEf4GI27gdWIIwaBjEimuJlEY+7K
		@@ -15,7 +15,7 @@ nZ7kVMRoiXCbjL6VAtNa4Zy1Af/GOm0iCIDpholeujQ95xew7rQnAgMA//8=
		-----END RSA PUBLIC KEY-----

		# Router 2
		moria.mit.edu 9002 9012 9022 9032 1000000
		router moria.mit.edu 9002 9012 9022 9032 1000000
		-----BEGIN RSA PUBLIC KEY-----
		MIGJAoGBANX/HHRuudz274MFSQ4manX8DhtsIuogNUyco9/0dr+XsfioTGd3RgMj
		aSWlD87arkZO4hHBPHe0q89Z3s1UtUsyQ/VmsxSv9g2OCnF/dU2Nz4h6+Al3iNJF
		@@ -23,7 +23,7 @@ aSWlD87arkZO4hHBPHe0q89Z3s1UtUsyQ/VmsxSv9g2OCnF/dU2Nz4h6+Al3iNJF
		-----END RSA PUBLIC KEY-----

		# Router 3
		moria.mit.edu 9003 9013 9023 9033 1000000
		router moria.mit.edu 9003 9013 9023 9033 1000000
		-----BEGIN RSA PUBLIC KEY-----
		MIGJAoGBAJfkNWCaNkYIRwfHT06KBU6dz8W1xDpW5ezGJwAOoxCX3/ZNoUicb/1V
		oB3OzW6VxWIiht3da/3K0ywiBOOCcf6BabKoMdiPpH7NIeu6XRmBYK2uqW13gBgh

src/config/routers.or

+6 −6

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		# DirPort is where the router listens for directory download requests

		# Router 1
		moria.mit.edu 9001 9011 9021 9031 1000000
		router moria.mit.edu 9001 9011 9021 9031 1000000
		-----BEGIN RSA PUBLIC KEY-----
		MIGJAoGBAMBBuk1sYxEg5jLAJy86U3GGJ7EGMSV7yoA6mmcsEVU3pwTUrpbpCmwS
		7BvovoY3z4zk63NZVBErgKQUDkn3pp8n83xZgEf4GI27gdWIIwaBjEimuJlEY+7K
		@@ -15,7 +15,7 @@ nZ7kVMRoiXCbjL6VAtNa4Zy1Af/GOm0iCIDpholeujQ95xew7rQnAgMA//8=
		-----END RSA PUBLIC KEY-----

		# Router 2
		moria.mit.edu 9002 9012 9022 9032 1000000
		router moria.mit.edu 9002 9012 9022 9032 1000000
		-----BEGIN RSA PUBLIC KEY-----
		MIGJAoGBANX/HHRuudz274MFSQ4manX8DhtsIuogNUyco9/0dr+XsfioTGd3RgMj
		aSWlD87arkZO4hHBPHe0q89Z3s1UtUsyQ/VmsxSv9g2OCnF/dU2Nz4h6+Al3iNJF
		@@ -23,28 +23,28 @@ aSWlD87arkZO4hHBPHe0q89Z3s1UtUsyQ/VmsxSv9g2OCnF/dU2Nz4h6+Al3iNJF
		-----END RSA PUBLIC KEY-----

		# Router 3
		moria.mit.edu 9003 9013 9023 9033 1000000
		router moria.mit.edu 9003 9013 9023 9033 1000000
		-----BEGIN RSA PUBLIC KEY-----
		MIGJAoGBAJfkNWCaNkYIRwfHT06KBU6dz8W1xDpW5ezGJwAOoxCX3/ZNoUicb/1V
		oB3OzW6VxWIiht3da/3K0ywiBOOCcf6BabKoMdiPpH7NIeu6XRmBYK2uqW13gBgh
		xJbQBb58Nx8Fr05XkvLG6i+vTDY3MZOW3E2/DwSe/jFzuHSD5b3nAgMA//8=
		-----END RSA PUBLIC KEY-----

		moria.mit.edu 9004 9014 9024 0 1000000
		router moria.mit.edu 9004 9014 9024 0 1000000
		-----BEGIN RSA PUBLIC KEY-----
		MIGJAoGBAKD2BDZQpGq/aAbZ7t+/7qktZVEbhUGe097gIjWH9gXcIOIm0CJMe3rN
		MsBJsQMi5Uwqrz+Invb5n6bswrNlJp/bCKBhGTvUCfxg7c8xZy71PPSIPnTg1qXl
		p5fyAkgCYkZNgEEZzQDHv1GRvLCs92kURjSJE5y8QU0dXfbzms8PAgMA//8=
		-----END RSA PUBLIC KEY-----

		mosg.cl.cam.ac.uk 9005 9015 9025 0 1000000
		router mosg.cl.cam.ac.uk 9005 9015 9025 0 1000000
		-----BEGIN RSA PUBLIC KEY-----
		MIGJAoGBAMMHEjhhawM6S14ETFVcvByU7D/baN2JMcCweKKJ7zcSurDnpgRH/Uo7
		05+bZE3BCy4OkAqQbGlKd/ejBOuXjEtS0mJo5xwDX9StKguhgFRk60hhrF2OFJm4
		VLItXA6U2NLOrc+FBCv/9laLpBrxOb8Wuct0l/lyZ2/OfE9yYhC3AgMA//8=
		-----END RSA PUBLIC KEY-----

		66.17.17.207 9006 9016 9026 0 1000000
		router 66.17.17.207 9006 9016 9026 0 1000000
		-----BEGIN RSA PUBLIC KEY-----
		MIGJAoGBAL5cpmH34kVfmHd+A00vMton3pLGHAVf7BYkSMif8e/O5zXTUXRi4w78
		jDcGNo2yFM3htTpT5/tWs/Z2+B/mx8Kz+AhHzZ9z0PdQreDSqxXjF+jmfCyx9Teq

src/or/main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -565,7 +565,7 @@ int dump_router_to_string(char s, int maxlen, routerinfo_t router) {
		return 0;
		}

		result = snprintf(s, maxlen, "%s %d %d %d %d %d\n%s",
		result = snprintf(s, maxlen, "router %s %d %d %d %d %d\n%s",
		router->address,
		router->or_port,
		router->op_port,

src/or/onion.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -347,6 +347,7 @@ crypt_path_t onion_generate_cpath(routerinfo_t *firsthop) {
		int routelen; /* length of the route */
		unsigned int route; / hops in the route as an array of indexes into rarray */
		crypt_path_t *cpath=NULL;
		directory_t *dir;
		routerinfo_t **rarray;
		int rarray_len;
		int i;
		@@ -354,7 +355,9 @@ crypt_path_t onion_generate_cpath(routerinfo_t *firsthop) {
		routerinfo_t *router;
		struct in_addr netaddr;

		router_get_rarray(&rarray, &rarray_len);
		router_get_directory(&dir);
		rarray = dir->routers;
		rarray_len = dir->n_routers;

		/* choose a route */
		route = new_route(options.CoinWeight, rarray, rarray_len, &routelen);