Commit Graph

224 Commits

Author SHA1 Message Date
Neale Pickett 25d252e167 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-05-30 18:04:32 -06:00
Neale Pickett 58bc201f03 move mcp to new points architecture 2012-05-30 18:04:24 -06:00
Aaron J. McPhall 7b0d5d53cd updates to parsing on puzzles.cgi 2012-05-30 13:51:40 -06:00
Aaron J. McPhall d089760ce3 Merge branch 'master' of woozle.org:~neale/projects/ctf 2012-05-30 12:21:11 -06:00
Aaron J. McPhall bf302e4744 puzzles.cgi now inspects map files 2012-05-30 12:19:07 -06:00
Neale Pickett a26f431031 Lower probability of line noise 2012-05-30 11:17:35 -06:00
Neale Pickett 4671a56f59 Console work + modem.c 2012-05-29 22:45:20 -06:00
Neale Pickett cde9c4c1cf debugged p2 console 2012-05-25 22:38:46 -06:00
Neale Pickett 4c9ab27571 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-05-25 12:27:05 -06:00
Neale Pickett c4f38f453d begin work on p2 scoreboard 2012-05-25 12:26:54 -06:00
Neale Pickett c3ef7bb2e6 Merge remote-tracking branch 'origin/master'
Conflicts:
	packages/mcp/www/credits.html
2012-05-24 20:35:19 -06:00
Neale Pickett a5b18317af add people to credits 2012-05-24 20:34:31 -06:00
Neale Pickett a9ee3df1e2 add p2 static html 2012-05-24 16:27:24 -06:00
Neale Pickett 8392fe441b firm up p2 console, add new tank 2012-05-24 15:16:19 -06:00
Neale Pickett 7f83cabdad make wopr work again 2012-05-22 12:54:51 -06:00
Neale Pickett fa8e03613a Make OpenWRT work, save nonce in addteam 2012-05-18 22:03:53 -06:00
Neale Pickett 8c71006a6f New OpenWRT configuration 2012-05-11 17:56:29 -06:00
Neale Pickett 46147ee5df Fix root account creation race condition 2012-05-11 11:15:42 -06:00
Neale Pickett 3bd320aa32 Make octopus-redirect stop bringing down the address 2012-05-11 11:15:13 -06:00
Neale Pickett 9cc822c467 fixes for ARM build 2012-05-10 12:32:09 -06:00
Neale Pickett ca0f7cb1ba Project 2 console 2012-04-24 12:22:32 -06:00
Neale Pickett 00c5ad65c4 last-minute fixes for ipv4 2012-04-24 10:03:14 -06:00
Neale Pickett 1502fb56c5 fix v4 IRC link 2012-04-19 17:48:50 -06:00
Neale Pickett c914035226 Just call it FIRE 2012-04-19 17:46:52 -06:00
Neale Pickett 69218e13ba reintegrate ipv4, tanks 2012-04-19 17:40:30 -06:00
Neale Pickett e2cc914da4 Archive TF4 state 2012-02-13 12:42:08 -07:00
Neale Pickett 28ef7ae2ca fix ircd configuration 2012-02-08 19:30:57 -07:00
Neale Pickett 812ee9ba9a more tf vendor tokens, cow mods, router mods 2012-02-08 10:15:01 -07:00
Neale Pickett fbcb48a738 Merge branch 'master' of fozzie:projects/ctf 2012-02-03 15:21:25 -07:00
Neale Pickett 0c9c1a9aca Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-02-02 17:15:41 -07:00
Neale Pickett 2b6c3005f7 install fixes, tweak playfair 2012-02-02 17:14:41 -07:00
Neale Pickett 6c74cc1f83 tweak scoreboard 2012-02-02 16:51:19 -07:00
Neale Pickett d356e18e97 New forensic tokens, course assignments, new table diagram 2012-02-01 17:11:46 -07:00
Neale Pickett 81ac3baeac get cowbull working 2012-01-31 17:23:55 -07:00
Neale Pickett aee131d2b2 Merge branch 'master' of fozzie.woozle.org:projects/ctf 2012-01-31 16:51:44 -07:00
Neale Pickett 9451b858c5 Merge branch 'master' of fozzie:projects/ctf 2012-01-31 16:51:38 -07:00
Neale Pickett 84afee3e42 Merge branch 'master' of fozzie.woozle.org:projects/ctf 2012-01-31 16:48:31 -07:00
Neale Pickett 4c92b67a2b clean up cowbull, some docs 2012-01-31 16:45:53 -07:00
Aaron McPhall cd4797405f Changed scoring.html to reflect multi-point tokens 2012-01-31 17:39:01 -05:00
Neale Pickett eb02ce835e Merge remote branch 'origin/master' 2012-01-31 10:50:49 -07:00
Neale Pickett 8bbc2d5593 add static route for kevin, bump radvd version 2012-01-31 10:50:42 -07:00
Neale Pickett 6ff2767310 course assignment program, add forensic tokens 2012-01-30 17:08:41 -07:00
Neale Pickett 07090c9d0e some TF4 tokens 2012-01-25 12:45:25 -07:00
Neale Pickett d07546d5ab nope, didn\'t want logger 2012-01-20 17:02:37 -07:00
Neale Pickett 20c6cfe3d1 work on cowcli 2012-01-20 17:02:07 -07:00
Neale Pickett 99a5ea1017 Bind cowcli to low port 2012-01-19 22:13:44 -07:00
Neale Pickett e6c4a218df Add nascent cowcli 2012-01-19 22:06:14 -07:00
Neale Pickett 02f21d3964 cowd which runs 2012-01-19 16:30:04 -07:00
Neale Pickett 1d6b8f6971 Merge branch 'master' of fozzie:projects/ctf 2012-01-18 21:41:21 -07:00
Neale Pickett d785404d8d Start at cows and bulls game 2012-01-18 21:40:56 -07:00
Neale Pickett 713027b737 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2011-11-05 17:42:28 -06:00
Neale Pickett f01680990c increase ipv6 neighbor threshholds 2011-11-05 17:40:14 -06:00
Neale Pickett 81bc9dd686 put tanks back in 2011-11-05 14:27:56 -06:00
Aaron J. McPhall ee27cf1151 Fixed flushing bug 2011-11-04 11:03:48 -06:00
Aaron J. McPhall 5ee06f79cd Fixed condition in playfair where xx -> XX XX 2011-11-04 10:48:58 -06:00
Neale Pickett 728152af50 fix revwords build 2011-11-03 22:22:19 -06:00
Neale Pickett 106635bc37 add playfair live category 2011-11-03 22:22:07 -06:00
Neale Pickett 82d9edff6f multi-point tokens in radio 2011-11-03 18:51:28 -06:00
Neale Pickett 59282a8542 add Kate-o's radio 2011-11-03 18:50:42 -06:00
Neale Pickett 74628157c2 add revwords package 2011-11-01 18:56:04 -06:00
Neale Pickett 543b0a5b1b add router sanity check, fix mcp race condition 2011-10-19 16:16:57 -06:00
Neale Pickett 3619508209 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2011-10-17 07:31:51 -06:00
Neale Pickett ded581f070 printf working 2011-10-14 22:10:25 -06:00
Neale Pickett ecbc2eb44d add some stuff I forgot (it's late) 2011-10-13 22:14:35 -06:00
Neale Pickett 7b751ac92b add fizzbuzz 2011-10-13 22:12:53 -06:00
Neale Pickett 61680f9cff make octopus use a changeable token 2011-10-13 21:24:29 -06:00
Neale Pickett 884ba02a51 add multicaster, verify token junk 2011-10-13 21:15:11 -06:00
Neale Pickett f021ffd092 Verified claim.cgi, puzzled, scoreboard. Looking good. 2011-10-13 17:22:03 -06:00
Neale Pickett ffa1ce9271 make points submission almost work again 2011-10-12 17:41:19 -06:00
Neale Pickett 87ad3b5724 Merge branch 'master' of fozzie.woozle.org:projects/ctf 2011-10-12 10:50:53 -06:00
Neale Pickett 62c0d3de8c replace mrd6 with ecmh 2011-10-12 10:50:09 -06:00
Neale Pickett 195bcd58e8 stop building lxc by default 2011-10-12 10:49:37 -06:00
Cherish A. Franco f3eb4e43e0 Done with AWESOME server I think! ~Cherish 2011-10-11 17:14:19 -06:00
Cherish A. Franco 59392e54d8 Fixing those stupid exit(10); things. ~Cherish 2011-10-11 16:02:51 -06:00
Cherish A. Franco 22bd672960 Working on that server again, Now it does more stuff, er, more address getting. ~Cherish 2011-10-11 15:54:52 -06:00
Neale Pickett d76aad9e9e fizzbuzz puzzle 2011-10-10 22:28:56 -06:00
Cherish A. Franco 5167ce2499 Making client do some snazzy stuff like sendto(). ~Cherish 2011-09-29 16:04:38 -06:00
Neale Pickett 4df59a3ae5 Make multicast packets have >1 hops 2011-09-29 14:29:19 -06:00
Neale Pickett e205b5913c add multicaster 2011-09-29 09:32:27 -06:00
Neale Pickett bdff29149a add mrd6 to router image 2011-09-28 15:47:49 -06:00
Neale Pickett 7db7440fbf Make LXC binaries search the right place for libraries 2011-09-26 14:13:37 -06:00
Neale Pickett 82586986f3 Merge branch 'lxc'
Conflicts:
	packages/lxc/lxc.mk
2011-09-26 13:03:43 -06:00
Neale Pickett bf40023ac6 LXC compiling 2011-09-26 13:00:42 -06:00
Neale Pickett 0df9801976 Reall move CONFIG_XCOMPILE_FLAGS into packages.mk 2011-09-26 12:13:50 -06:00
Neale Pickett 3f48e7630a Move CONFIG_XCOMPILE_FLAGS into packages.mk 2011-09-26 11:52:28 -06:00
Neale Pickett 45c52d73f8 Attempt to bring in lxc 2011-09-26 11:51:04 -06:00
Neale Pickett 7fbe6d2650 cleanup, add lxc package (broken) 2011-09-23 17:05:14 -06:00
Neale Pickett c86c2c59b7 /service/* stays up 2011-09-23 16:57:26 -06:00
Neale Pickett 8f009026a7 remove armadillo category 2011-09-23 16:05:17 -06:00
Neale Pickett eeb583b5fb IPv6 for ircd, mcp 2011-09-23 16:04:25 -06:00
Neale Pickett 79b6534204 resolve packages passwd conflicts 2011-09-23 13:42:02 -06:00
Neale Pickett da7a8b2f6b remove dnsmasq from router package 2011-09-22 18:41:28 -06:00
Neale Pickett 17d0544c1e IPv6 router 2011-09-22 18:32:03 -06:00
Neale Pickett ae37e47966 Merge remote-tracking branch 'origin/p2'
Conflicts:
	packages/bletchley/300/index.mdwn
	packages/sequence/400/key
2011-09-21 17:04:34 -06:00
Neale Pickett 01a041c013 Merge remote-tracking branch 'origin/inferno' 2011-09-21 17:03:26 -06:00
Neale Pickett 64b2316860 octopus port to ipv6 2011-09-21 16:19:00 -06:00
Neale Pickett 5c870b3c6f fixes for new buildroot + cleanup from merge 2011-09-21 15:23:09 -06:00
Neale Pickett bdc64d547c Merge remote branch 'fozzie/master'
Conflicts:
	packages/ctfbase/service/ctfd/run
2011-09-20 09:21:49 -06:00
Neale Pickett 6ba995ae2b create passwd file in ctf package 2011-09-20 09:21:11 -06:00
Neale Pickett 709a0e3c90 modify a few things 2011-09-16 10:08:07 -06:00