Commit Graph

395 Commits

Author SHA1 Message Date
Jesse McConnell 2e9cf50c3a close frame tests, statuscode is now int as it can't be unsigned short as spec requires, payload length parses clean with bad 1 byte payload packet 2012-06-27 14:36:33 -05:00
Jesse McConnell 984166641e tests for unknown control codes 2012-06-27 10:27:36 -05:00
Jesse McConnell 43d048f691 control frames can not set rsv bits + tests 2012-06-27 10:14:51 -05:00
Jesse McConnell fb7b9b2c19 additional testing of ping frames 2012-06-27 10:02:56 -05:00
Jesse McConnell a4ef07443a Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-27 09:10:33 -05:00
Jesse McConnell a0516774c0 empty frames with no constructor will generate correctly 2012-06-27 08:16:27 -05:00
Joakim Erdfelt fabb2e18a2 Cleaning up test cases 2012-06-26 16:41:39 -07:00
Joakim Erdfelt 334b7787cc Removing old generators (no longer used) 2012-06-26 16:35:52 -07:00
Joakim Erdfelt 41094cb685 Cleaning up the API after the discussion with Jesse 2012-06-26 16:35:23 -07:00
Joakim Erdfelt 4eeb433b44 Fixing 4 vs 8 byte payload length testing issue 2012-06-26 12:29:57 -07:00
Jesse McConnell 888314e08a update to new bytebuffer setup 2012-06-26 14:20:51 -05:00
Jesse McConnell 88ef0c5428 update to new bytebuffer setup 2012-06-26 14:16:13 -05:00
Jesse McConnell 9a9d24ecff binary tests akin to previous text frame tests 2012-06-26 13:48:25 -05:00
Joakim Erdfelt f9ef423be2 Eliminating the BufferPool management from the Generator as that's the wrong level to be managing BufferPool.release() 2012-06-26 11:10:29 -07:00
Joakim Erdfelt bf0c45d790 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-26 09:17:17 -07:00
Joakim Erdfelt c439bf3882 Fixing 64-bit payload length parsing issue 2012-06-26 09:17:04 -07:00
Jesse McConnell 89a26e6d75 add note to 64bit length code in frame generator 2012-06-26 11:14:34 -05:00
Jesse McConnell 6e2d9549c9 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-26 10:58:30 -05:00
Jesse McConnell 1a30f540bd more boundry tests and (temporary) fixes 2012-06-26 10:58:20 -05:00
Jesse McConnell ec3052d018 additional test cases coming, fix to parser for empty payloads and improvement to frame parser payload length insertion to byte buffer 2012-06-26 09:21:53 -05:00
Joakim Erdfelt e919c0dff8 Renaming ExtensionRef to ExtensionConfig, fleshing it out bunch more, and using it in Extension instance 2012-06-25 12:50:56 -07:00
Joakim Erdfelt 3cbcb20257 Deleting no longer needed handshake req/resp objects 2012-06-25 12:50:06 -07:00
Joakim Erdfelt 00d8f7b44d Dropping proposed WebSocket.Accept interface from websocket-core, it belongs in websocket-server 2012-06-25 12:49:42 -07:00
Jesse McConnell 5fb55086d4 last of the generator examples from spec 2012-06-25 09:10:12 -05:00
Joakim Erdfelt 8010c680e0 Early iteration of new API 2012-06-22 14:49:22 -07:00
Joakim Erdfelt ce9e7b7560 Fixing framing issues on gen 2012-06-22 14:07:36 -07:00
Jesse McConnell 4df532a211 couple more tests and an issue exposed in frame handler 2012-06-22 15:55:08 -05:00
Joakim Erdfelt 853905a7c0 Collaborating with Jesse on WebSocket API 2012-06-22 06:32:21 -07:00
Joakim Erdfelt 1a73c74d96 Fixing generator and parser unit tests 2012-06-21 15:31:04 -07:00
Joakim Erdfelt f80024bf2b Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-21 14:26:07 -07:00
Joakim Erdfelt 5a529ad4a2 Refactoring out the contents of the .api.WebSocket class in prep for rethink of original API class 2012-06-21 14:25:58 -07:00
Jesse McConnell f4a644347b some frame consolidation work in progress 2012-06-21 16:22:17 -05:00
Jesse McConnell aaf27d7e2a test 2012-06-21 13:13:08 -05:00
Jesse McConnell d8c12b5813 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-21 13:11:27 -05:00
Joakim Erdfelt ec51481c02 Adding Generator to Parser roundtrip test cases (refactored from old codebase) 2012-06-21 11:05:20 -07:00
Joakim Erdfelt 8e21e14c6d Minor documentation updates 2012-06-21 11:04:44 -07:00
Joakim Erdfelt 37249d09db Adding TEXT & BINARY to root generator map 2012-06-21 11:04:13 -07:00
Joakim Erdfelt dd668f7d8a Adding TextFrame(String) constructor 2012-06-21 11:03:51 -07:00
Joakim Erdfelt b3a26517db WebSocketPolicy new fields and documentation updates 2012-06-21 11:03:30 -07:00
Jesse McConnell a73d057578 ironing out generator issues at the byte lvl, so nice bit of progress 2012-06-20 18:42:24 -05:00
Joakim Erdfelt 5f5d613eba Removing old testcase (has replacements using new parser framework) 2012-06-20 14:44:12 -07:00
Joakim Erdfelt 4757a1a3ee Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-20 14:43:26 -07:00
Joakim Erdfelt 1692b4f7c2 Adding ClosePayloadParser & Tests 2012-06-20 14:43:16 -07:00
Jesse McConnell 8893b9c96a add text and binary frame generators 2012-06-20 16:34:45 -05:00
Joakim Erdfelt b61a58ad64 Adding policy violation testcase for parsing too large text frames 2012-06-20 14:19:55 -07:00
Joakim Erdfelt 085127c8f8 Integrating new policy changes 2012-06-20 14:08:47 -07:00
Joakim Erdfelt 2e6c307adc Refactoring WebSocketSettings to WebSocketPolicy to better conform to naming in use within RFC 6455 spec (discussed with jesse over phone) 2012-06-20 13:48:12 -07:00
Joakim Erdfelt d675be84ba Adding more testcases for Text Frames (and bug fixes) 2012-06-20 13:39:17 -07:00
Joakim Erdfelt ad6eee39d6 Minor formatting update 2012-06-20 11:30:04 -07:00
Joakim Erdfelt bec39bc953 Removing debug logigng from tests 2012-06-20 11:29:58 -07:00
Joakim Erdfelt 4fd00431d5 Finished Parsing of RFC 6455 examples 2012-06-20 11:13:21 -07:00
Jesse McConnell 917b84c454 working mask generator unit test 2012-06-20 09:56:59 -05:00
Jesse McConnell 75c99dbaff remove unneeded file 2012-06-20 09:30:57 -05:00
Jesse McConnell b6acc45820 maskgen -> masker + new packaging 2012-06-20 09:12:30 -05:00
Jesse McConnell c0d92cebd7 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-19 17:27:14 -05:00
Jesse McConnell a718d30a67 gettings settings down into generator, not sure this is right for masking or not yet 2012-06-19 17:27:02 -05:00
Jesse McConnell 2c26326998 gettings settings down into generator, not sure this is right for masking or not yet 2012-06-19 17:26:17 -05:00
Joakim Erdfelt 8bab5beb2b Cleanup around FrameParser.copyBuffer() 2012-06-19 15:17:14 -07:00
Joakim Erdfelt dcfa524211 Working TextFrame parsing (with masking) 2012-06-19 15:03:43 -07:00
Joakim Erdfelt 763b0b500d Adding ByteBufferAssert.assertEquals(String,ByteBuffer,ByteBuffer) 2012-06-19 14:43:42 -07:00
Joakim Erdfelt 8065d04a0d Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-19 14:38:15 -07:00
Joakim Erdfelt 03a1b68f38 Adding ByteBufferAssert to aide in testing 2012-06-19 14:38:02 -07:00
Jesse McConnell 8e1645f06b put framing butting in new buffer 2012-06-19 16:27:53 -05:00
Joakim Erdfelt 30901917eb Reworking Generator (with jesse on a hangout) 2012-06-19 14:05:47 -07:00
Joakim Erdfelt 228565068f Fixing method names to be consistent 2012-06-19 13:10:39 -07:00
Joakim Erdfelt 6bbeba9f59 Fixing PingPayloadParser with new FrameParser.copyBuffer() method 2012-06-19 13:07:57 -07:00
Joakim Erdfelt 17a7b12df1 Eliminating BaseFrame copy constructors and methods, fixing PongFrame(PingFrame) constructor 2012-06-19 12:28:51 -07:00
Joakim Erdfelt 9178bce643 Adding WebSocketSettings, integrating into Parser 2012-06-19 12:23:46 -07:00
Joakim Erdfelt 114ff6878b Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-19 11:14:05 -07:00
Joakim Erdfelt c1f3ad8d0e Cleaning up parsing layer to be less finicky 2012-06-19 11:13:54 -07:00
Jesse McConnell 289fb7c395 move payload into control frame, not doing close frame's reason and status code since we can
't create bytebuffers in the frames atm
2012-06-19 13:12:53 -05:00
Joakim Erdfelt 993c3788b9 Fixing up PongFrame to match PingFrame 2012-06-19 10:22:39 -07:00
Joakim Erdfelt 236bcb2b86 Adding RFC6455 parsing examples 2012-06-19 10:22:14 -07:00
Joakim Erdfelt 7227a86254 Initial pass at testing 2012-06-18 15:41:38 -07:00
Joakim Erdfelt f3532f9bd9 Moving test cases around, commenting others, we have a clean build of websocket-core now, suitable for testing 2012-06-18 14:38:49 -07:00
Joakim Erdfelt 3fa8a6ad3e Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-18 14:34:36 -07:00
Joakim Erdfelt 0866a75ce6 Making src/main/java error free (for build reasons) 2012-06-18 14:34:21 -07:00
Jesse McConnell d8893b4823 add simple test example 2012-06-18 16:30:19 -05:00
Joakim Erdfelt a4a5108da4 Merge fixes 2012-06-18 14:27:24 -07:00
Joakim Erdfelt cb6968d680 Introduction PayloadParser and OpCodes 2012-06-18 14:24:24 -07:00
Jesse McConnell 2562dc838b ping and close generators akin what we are looking at (atm at least) 2012-06-18 16:06:46 -05:00
Joakim Erdfelt b9ca387d53 Cleaning up 'frames' package 2012-06-18 13:42:47 -07:00
Jesse McConnell b696915b29 minor structural updates with joakim's latest 2012-06-18 14:03:25 -05:00
Jesse McConnell 6679c9436e minor structural updates with joakim's latest 2012-06-18 14:03:22 -05:00
Joakim Erdfelt 541ce89c5b Updates to BaseFrame and Parsers 2012-06-18 11:59:51 -07:00
Jesse McConnell c6802c75c8 add empty header placeholder 2012-06-18 13:10:39 -05:00
Jesse McConnell f4a416586e add ping, pong, close frames extending from a controlframe 2012-06-18 13:02:27 -05:00
Joakim Erdfelt 145b98a663 Reworking BaseFrame and WebSocket api classes 2012-06-18 10:28:19 -07:00
Jesse McConnell 1264f1aacc set baseframe as default type for interim 2012-06-18 12:10:04 -05:00
Joakim Erdfelt e768c37e50 Establishing BaseFrame 2012-06-18 10:08:10 -07:00
Joakim Erdfelt 494ecbb271 Renaming module and groupId for websocket-servlet to websocket-server to better reflect nature of module 2012-06-18 09:48:33 -07:00
Joakim Erdfelt 4c18bd5f45 Moving WebSocketHandler out of websocket-core into websocket-servlet 2012-06-18 09:37:07 -07:00
Joakim Erdfelt 6d09fb70fd Moving MaskGen into org.eclipse.jetty.websocket.generator package space 2012-06-12 13:57:12 -07:00
Joakim Erdfelt c7b2297216 Moving classes around, stubbing out new classes for jetty-9 refactor 2012-06-12 13:15:40 -07:00
Joakim Erdfelt d52de82a80 Splitting up websocket module into core/client/servlet modules 2012-06-12 12:43:29 -07:00