diff --git a/lib/lextable.h b/lib/lextable.h index 9d86577a..2d048c6c 100644 --- a/lib/lextable.h +++ b/lib/lextable.h @@ -3,27 +3,27 @@ 0x6F /* 'o' */, 0x30, 0x00 /* (to 0x0036 state 10) */, 0x68 /* 'h' */, 0x3C, 0x00 /* (to 0x0045 state 18) */, 0x63 /* 'c' */, 0x45, 0x00 /* (to 0x0051 state 23) */, - 0x73 /* 's' */, 0x60, 0x00 /* (to 0x006F state 34) */, - 0x75 /* 'u' */, 0x9F, 0x00 /* (to 0x00B1 state 64) */, - 0x0D /* '.' */, 0xB3, 0x00 /* (to 0x00C8 state 84) */, - 0x61 /* 'a' */, 0xEA, 0x00 /* (to 0x0102 state 134) */, - 0x69 /* 'i' */, 0x1D, 0x01 /* (to 0x0138 state 168) */, - 0x64 /* 'd' */, 0x9C, 0x01 /* (to 0x01BA state 270) */, - 0x72 /* 'r' */, 0x9F, 0x01 /* (to 0x01C0 state 275) */, + 0x75 /* 'u' */, 0x60, 0x00 /* (to 0x006F state 34) */, + 0x73 /* 's' */, 0x6D, 0x00 /* (to 0x007F state 48) */, + 0x0D /* '.' */, 0x97, 0x00 /* (to 0x00AC state 68) */, + 0x61 /* 'a' */, 0xE9, 0x00 /* (to 0x0101 state 129) */, + 0x69 /* 'i' */, 0x1C, 0x01 /* (to 0x0137 state 163) */, + 0x64 /* 'd' */, 0x9B, 0x01 /* (to 0x01B9 state 265) */, + 0x72 /* 'r' */, 0x9E, 0x01 /* (to 0x01BF state 270) */, 0x08, /* fail */ /* pos 0025: 1 */ 0xE5 /* 'e' -> */, /* pos 0026: 2 */ 0xF4 /* 't' -> */, /* pos 0027: 3 */ 0xA0 /* ' ' -> */, /* pos 0028: 4 */ 0x00, 0x00 /* - terminal marker 0 - */, /* pos 002a: 5 */ 0x6F /* 'o' */, 0x07, 0x00 /* (to 0x0031 state 6) */, - 0x72 /* 'r' */, 0x4B, 0x01 /* (to 0x0178 state 216) */, + 0x72 /* 'r' */, 0x4A, 0x01 /* (to 0x0177 state 211) */, 0x08, /* fail */ /* pos 0031: 6 */ 0xF3 /* 's' -> */, /* pos 0032: 7 */ 0xF4 /* 't' -> */, /* pos 0033: 8 */ 0xA0 /* ' ' -> */, /* pos 0034: 9 */ 0x00, 0x01 /* - terminal marker 1 - */, /* pos 0036: 10 */ 0x70 /* 'p' */, 0x07, 0x00 /* (to 0x003D state 11) */, - 0x72 /* 'r' */, 0x81, 0x00 /* (to 0x00BA state 72) */, + 0x72 /* 'r' */, 0x3F, 0x00 /* (to 0x0078 state 42) */, 0x08, /* fail */ /* pos 003d: 11 */ 0xF4 /* 't' -> */, /* pos 003e: 12 */ 0xE9 /* 'i' -> */, @@ -33,20 +33,20 @@ /* pos 0042: 16 */ 0xA0 /* ' ' -> */, /* pos 0043: 17 */ 0x00, 0x02 /* - terminal marker 2 - */, /* pos 0045: 18 */ 0x6F /* 'o' */, 0x07, 0x00 /* (to 0x004C state 19) */, - 0x74 /* 't' */, 0xB1, 0x00 /* (to 0x00F9 state 126) */, + 0x74 /* 't' */, 0x9E, 0x00 /* (to 0x00E6 state 110) */, 0x08, /* fail */ /* pos 004c: 19 */ 0xF3 /* 's' -> */, /* pos 004d: 20 */ 0xF4 /* 't' -> */, /* pos 004e: 21 */ 0xBA /* ':' -> */, /* pos 004f: 22 */ 0x00, 0x03 /* - terminal marker 3 - */, /* pos 0051: 23 */ 0x6F /* 'o' */, 0x07, 0x00 /* (to 0x0058 state 24) */, - 0x61 /* 'a' */, 0x2B, 0x01 /* (to 0x017F state 222) */, + 0x61 /* 'a' */, 0x2A, 0x01 /* (to 0x017E state 217) */, 0x08, /* fail */ /* pos 0058: 24 */ 0x6E /* 'n' */, 0x07, 0x00 /* (to 0x005F state 25) */, - 0x6F /* 'o' */, 0x40, 0x01 /* (to 0x019B state 248) */, + 0x6F /* 'o' */, 0x3F, 0x01 /* (to 0x019A state 243) */, 0x08, /* fail */ /* pos 005f: 25 */ 0x6E /* 'n' */, 0x07, 0x00 /* (to 0x0066 state 26) */, - 0x74 /* 't' */, 0x3F, 0x01 /* (to 0x01A1 state 253) */, + 0x74 /* 't' */, 0x3E, 0x01 /* (to 0x01A0 state 248) */, 0x08, /* fail */ /* pos 0066: 26 */ 0xE5 /* 'e' -> */, /* pos 0067: 27 */ 0xE3 /* 'c' -> */, @@ -56,283 +56,296 @@ /* pos 006b: 31 */ 0xEE /* 'n' -> */, /* pos 006c: 32 */ 0xBA /* ':' -> */, /* pos 006d: 33 */ 0x00, 0x04 /* - terminal marker 4 - */, -/* pos 006f: 34 */ 0xE5 /* 'e' -> */, -/* pos 0070: 35 */ 0xE3 /* 'c' -> */, -/* pos 0071: 36 */ 0xAD /* '-' -> */, -/* pos 0072: 37 */ 0xF7 /* 'w' -> */, -/* pos 0073: 38 */ 0xE5 /* 'e' -> */, -/* pos 0074: 39 */ 0xE2 /* 'b' -> */, -/* pos 0075: 40 */ 0xF3 /* 's' -> */, -/* pos 0076: 41 */ 0xEF /* 'o' -> */, -/* pos 0077: 42 */ 0xE3 /* 'c' -> */, -/* pos 0078: 43 */ 0xEB /* 'k' -> */, -/* pos 0079: 44 */ 0xE5 /* 'e' -> */, -/* pos 007a: 45 */ 0xF4 /* 't' -> */, -/* pos 007b: 46 */ 0xAD /* '-' -> */, -/* pos 007c: 47 */ 0x6B /* 'k' */, 0x19, 0x00 /* (to 0x0095 state 48) */, - 0x70 /* 'p' */, 0x28, 0x00 /* (to 0x00A7 state 55) */, - 0x64 /* 'd' */, 0x3F, 0x00 /* (to 0x00C1 state 78) */, - 0x76 /* 'v' */, 0x48, 0x00 /* (to 0x00CD state 87) */, - 0x6F /* 'o' */, 0x4E, 0x00 /* (to 0x00D6 state 95) */, - 0x65 /* 'e' */, 0x53, 0x00 /* (to 0x00DE state 102) */, - 0x61 /* 'a' */, 0x5C, 0x00 /* (to 0x00EA state 113) */, - 0x6E /* 'n' */, 0x61, 0x00 /* (to 0x00F2 state 120) */, +/* pos 006f: 34 */ 0xF0 /* 'p' -> */, +/* pos 0070: 35 */ 0xE7 /* 'g' -> */, +/* pos 0071: 36 */ 0xF2 /* 'r' -> */, +/* pos 0072: 37 */ 0xE1 /* 'a' -> */, +/* pos 0073: 38 */ 0xE4 /* 'd' -> */, +/* pos 0074: 39 */ 0xE5 /* 'e' -> */, +/* pos 0075: 40 */ 0xBA /* ':' -> */, +/* pos 0076: 41 */ 0x00, 0x05 /* - terminal marker 5 - */, +/* pos 0078: 42 */ 0xE9 /* 'i' -> */, +/* pos 0079: 43 */ 0xE7 /* 'g' -> */, +/* pos 007a: 44 */ 0xE9 /* 'i' -> */, +/* pos 007b: 45 */ 0xEE /* 'n' -> */, +/* pos 007c: 46 */ 0xBA /* ':' -> */, +/* pos 007d: 47 */ 0x00, 0x06 /* - terminal marker 6 - */, +/* pos 007f: 48 */ 0xE5 /* 'e' -> */, +/* pos 0080: 49 */ 0xE3 /* 'c' -> */, +/* pos 0081: 50 */ 0xAD /* '-' -> */, +/* pos 0082: 51 */ 0xF7 /* 'w' -> */, +/* pos 0083: 52 */ 0xE5 /* 'e' -> */, +/* pos 0084: 53 */ 0xE2 /* 'b' -> */, +/* pos 0085: 54 */ 0xF3 /* 's' -> */, +/* pos 0086: 55 */ 0xEF /* 'o' -> */, +/* pos 0087: 56 */ 0xE3 /* 'c' -> */, +/* pos 0088: 57 */ 0xEB /* 'k' -> */, +/* pos 0089: 58 */ 0xE5 /* 'e' -> */, +/* pos 008a: 59 */ 0xF4 /* 't' -> */, +/* pos 008b: 60 */ 0xAD /* '-' -> */, +/* pos 008c: 61 */ 0x64 /* 'd' */, 0x19, 0x00 /* (to 0x00A5 state 62) */, + 0x65 /* 'e' */, 0x20, 0x00 /* (to 0x00AF state 70) */, + 0x6B /* 'k' */, 0x29, 0x00 /* (to 0x00BB state 81) */, + 0x70 /* 'p' */, 0x38, 0x00 /* (to 0x00CD state 88) */, + 0x61 /* 'a' */, 0x3F, 0x00 /* (to 0x00D7 state 97) */, + 0x6E /* 'n' */, 0x44, 0x00 /* (to 0x00DF state 104) */, + 0x76 /* 'v' */, 0x38, 0x01 /* (to 0x01D6 state 284) */, + 0x6F /* 'o' */, 0x3E, 0x01 /* (to 0x01DF state 292) */, 0x08, /* fail */ -/* pos 0095: 48 */ 0xE5 /* 'e' -> */, -/* pos 0096: 49 */ 0xF9 /* 'y' -> */, -/* pos 0097: 50 */ 0x31 /* '1' */, 0x0A, 0x00 /* (to 0x00A1 state 51) */, - 0x32 /* '2' */, 0x0A, 0x00 /* (to 0x00A4 state 53) */, - 0x3A /* ':' */, 0x2E, 0x00 /* (to 0x00CB state 86) */, +/* pos 00a5: 62 */ 0xF2 /* 'r' -> */, +/* pos 00a6: 63 */ 0xE1 /* 'a' -> */, +/* pos 00a7: 64 */ 0xE6 /* 'f' -> */, +/* pos 00a8: 65 */ 0xF4 /* 't' -> */, +/* pos 00a9: 66 */ 0xBA /* ':' -> */, +/* pos 00aa: 67 */ 0x00, 0x07 /* - terminal marker 7 - */, +/* pos 00ac: 68 */ 0x8A /* '.' -> */, +/* pos 00ad: 69 */ 0x00, 0x08 /* - terminal marker 8 - */, +/* pos 00af: 70 */ 0xF8 /* 'x' -> */, +/* pos 00b0: 71 */ 0xF4 /* 't' -> */, +/* pos 00b1: 72 */ 0xE5 /* 'e' -> */, +/* pos 00b2: 73 */ 0xEE /* 'n' -> */, +/* pos 00b3: 74 */ 0xF3 /* 's' -> */, +/* pos 00b4: 75 */ 0xE9 /* 'i' -> */, +/* pos 00b5: 76 */ 0xEF /* 'o' -> */, +/* pos 00b6: 77 */ 0xEE /* 'n' -> */, +/* pos 00b7: 78 */ 0xF3 /* 's' -> */, +/* pos 00b8: 79 */ 0xBA /* ':' -> */, +/* pos 00b9: 80 */ 0x00, 0x09 /* - terminal marker 9 - */, +/* pos 00bb: 81 */ 0xE5 /* 'e' -> */, +/* pos 00bc: 82 */ 0xF9 /* 'y' -> */, +/* pos 00bd: 83 */ 0x31 /* '1' */, 0x0A, 0x00 /* (to 0x00C7 state 84) */, + 0x32 /* '2' */, 0x0A, 0x00 /* (to 0x00CA state 86) */, + 0x3A /* ':' */, 0x11, 0x01 /* (to 0x01D4 state 283) */, 0x08, /* fail */ -/* pos 00a1: 51 */ 0xBA /* ':' -> */, -/* pos 00a2: 52 */ 0x00, 0x05 /* - terminal marker 5 - */, -/* pos 00a4: 53 */ 0xBA /* ':' -> */, -/* pos 00a5: 54 */ 0x00, 0x06 /* - terminal marker 6 - */, -/* pos 00a7: 55 */ 0xF2 /* 'r' -> */, -/* pos 00a8: 56 */ 0xEF /* 'o' -> */, -/* pos 00a9: 57 */ 0xF4 /* 't' -> */, -/* pos 00aa: 58 */ 0xEF /* 'o' -> */, -/* pos 00ab: 59 */ 0xE3 /* 'c' -> */, -/* pos 00ac: 60 */ 0xEF /* 'o' -> */, -/* pos 00ad: 61 */ 0xEC /* 'l' -> */, -/* pos 00ae: 62 */ 0xBA /* ':' -> */, -/* pos 00af: 63 */ 0x00, 0x07 /* - terminal marker 7 - */, -/* pos 00b1: 64 */ 0xF0 /* 'p' -> */, -/* pos 00b2: 65 */ 0xE7 /* 'g' -> */, -/* pos 00b3: 66 */ 0xF2 /* 'r' -> */, -/* pos 00b4: 67 */ 0xE1 /* 'a' -> */, -/* pos 00b5: 68 */ 0xE4 /* 'd' -> */, -/* pos 00b6: 69 */ 0xE5 /* 'e' -> */, -/* pos 00b7: 70 */ 0xBA /* ':' -> */, -/* pos 00b8: 71 */ 0x00, 0x08 /* - terminal marker 8 - */, -/* pos 00ba: 72 */ 0xE9 /* 'i' -> */, -/* pos 00bb: 73 */ 0xE7 /* 'g' -> */, -/* pos 00bc: 74 */ 0xE9 /* 'i' -> */, -/* pos 00bd: 75 */ 0xEE /* 'n' -> */, -/* pos 00be: 76 */ 0xBA /* ':' -> */, -/* pos 00bf: 77 */ 0x00, 0x09 /* - terminal marker 9 - */, -/* pos 00c1: 78 */ 0xF2 /* 'r' -> */, -/* pos 00c2: 79 */ 0xE1 /* 'a' -> */, -/* pos 00c3: 80 */ 0xE6 /* 'f' -> */, -/* pos 00c4: 81 */ 0xF4 /* 't' -> */, -/* pos 00c5: 82 */ 0xBA /* ':' -> */, -/* pos 00c6: 83 */ 0x00, 0x0A /* - terminal marker 10 - */, -/* pos 00c8: 84 */ 0x8A /* '.' -> */, -/* pos 00c9: 85 */ 0x00, 0x0B /* - terminal marker 11 - */, -/* pos 00cb: 86 */ 0x00, 0x0C /* - terminal marker 12 - */, -/* pos 00cd: 87 */ 0xE5 /* 'e' -> */, -/* pos 00ce: 88 */ 0xF2 /* 'r' -> */, -/* pos 00cf: 89 */ 0xF3 /* 's' -> */, -/* pos 00d0: 90 */ 0xE9 /* 'i' -> */, -/* pos 00d1: 91 */ 0xEF /* 'o' -> */, -/* pos 00d2: 92 */ 0xEE /* 'n' -> */, -/* pos 00d3: 93 */ 0xBA /* ':' -> */, -/* pos 00d4: 94 */ 0x00, 0x0D /* - terminal marker 13 - */, -/* pos 00d6: 95 */ 0xF2 /* 'r' -> */, -/* pos 00d7: 96 */ 0xE9 /* 'i' -> */, -/* pos 00d8: 97 */ 0xE7 /* 'g' -> */, -/* pos 00d9: 98 */ 0xE9 /* 'i' -> */, -/* pos 00da: 99 */ 0xEE /* 'n' -> */, -/* pos 00db: 100 */ 0xBA /* ':' -> */, -/* pos 00dc: 101 */ 0x00, 0x0E /* - terminal marker 14 - */, -/* pos 00de: 102 */ 0xF8 /* 'x' -> */, -/* pos 00df: 103 */ 0xF4 /* 't' -> */, -/* pos 00e0: 104 */ 0xE5 /* 'e' -> */, -/* pos 00e1: 105 */ 0xEE /* 'n' -> */, -/* pos 00e2: 106 */ 0xF3 /* 's' -> */, -/* pos 00e3: 107 */ 0xE9 /* 'i' -> */, -/* pos 00e4: 108 */ 0xEF /* 'o' -> */, -/* pos 00e5: 109 */ 0xEE /* 'n' -> */, -/* pos 00e6: 110 */ 0xF3 /* 's' -> */, -/* pos 00e7: 111 */ 0xBA /* ':' -> */, -/* pos 00e8: 112 */ 0x00, 0x0F /* - terminal marker 15 - */, -/* pos 00ea: 113 */ 0xE3 /* 'c' -> */, -/* pos 00eb: 114 */ 0xE3 /* 'c' -> */, -/* pos 00ec: 115 */ 0xE5 /* 'e' -> */, -/* pos 00ed: 116 */ 0xF0 /* 'p' -> */, -/* pos 00ee: 117 */ 0xF4 /* 't' -> */, -/* pos 00ef: 118 */ 0xBA /* ':' -> */, -/* pos 00f0: 119 */ 0x00, 0x10 /* - terminal marker 16 - */, -/* pos 00f2: 120 */ 0xEF /* 'o' -> */, -/* pos 00f3: 121 */ 0xEE /* 'n' -> */, -/* pos 00f4: 122 */ 0xE3 /* 'c' -> */, -/* pos 00f5: 123 */ 0xE5 /* 'e' -> */, -/* pos 00f6: 124 */ 0xBA /* ':' -> */, -/* pos 00f7: 125 */ 0x00, 0x11 /* - terminal marker 17 - */, -/* pos 00f9: 126 */ 0xF4 /* 't' -> */, -/* pos 00fa: 127 */ 0xF0 /* 'p' -> */, -/* pos 00fb: 128 */ 0xAF /* '/' -> */, -/* pos 00fc: 129 */ 0xB1 /* '1' -> */, -/* pos 00fd: 130 */ 0xAE /* '.' -> */, -/* pos 00fe: 131 */ 0xB1 /* '1' -> */, -/* pos 00ff: 132 */ 0xA0 /* ' ' -> */, -/* pos 0100: 133 */ 0x00, 0x12 /* - terminal marker 18 - */, -/* pos 0102: 134 */ 0x63 /* 'c' */, 0x07, 0x00 /* (to 0x0109 state 135) */, - 0x75 /* 'u' */, 0x88, 0x00 /* (to 0x018D state 235) */, +/* pos 00c7: 84 */ 0xBA /* ':' -> */, +/* pos 00c8: 85 */ 0x00, 0x0A /* - terminal marker 10 - */, +/* pos 00ca: 86 */ 0xBA /* ':' -> */, +/* pos 00cb: 87 */ 0x00, 0x0B /* - terminal marker 11 - */, +/* pos 00cd: 88 */ 0xF2 /* 'r' -> */, +/* pos 00ce: 89 */ 0xEF /* 'o' -> */, +/* pos 00cf: 90 */ 0xF4 /* 't' -> */, +/* pos 00d0: 91 */ 0xEF /* 'o' -> */, +/* pos 00d1: 92 */ 0xE3 /* 'c' -> */, +/* pos 00d2: 93 */ 0xEF /* 'o' -> */, +/* pos 00d3: 94 */ 0xEC /* 'l' -> */, +/* pos 00d4: 95 */ 0xBA /* ':' -> */, +/* pos 00d5: 96 */ 0x00, 0x0C /* - terminal marker 12 - */, +/* pos 00d7: 97 */ 0xE3 /* 'c' -> */, +/* pos 00d8: 98 */ 0xE3 /* 'c' -> */, +/* pos 00d9: 99 */ 0xE5 /* 'e' -> */, +/* pos 00da: 100 */ 0xF0 /* 'p' -> */, +/* pos 00db: 101 */ 0xF4 /* 't' -> */, +/* pos 00dc: 102 */ 0xBA /* ':' -> */, +/* pos 00dd: 103 */ 0x00, 0x0D /* - terminal marker 13 - */, +/* pos 00df: 104 */ 0xEF /* 'o' -> */, +/* pos 00e0: 105 */ 0xEE /* 'n' -> */, +/* pos 00e1: 106 */ 0xE3 /* 'c' -> */, +/* pos 00e2: 107 */ 0xE5 /* 'e' -> */, +/* pos 00e3: 108 */ 0xBA /* ':' -> */, +/* pos 00e4: 109 */ 0x00, 0x0E /* - terminal marker 14 - */, +/* pos 00e6: 110 */ 0xF4 /* 't' -> */, +/* pos 00e7: 111 */ 0xF0 /* 'p' -> */, +/* pos 00e8: 112 */ 0x2F /* '/' */, 0x07, 0x00 /* (to 0x00EF state 113) */, + 0x32 /* '2' */, 0x0A, 0x00 /* (to 0x00F5 state 118) */, 0x08, /* fail */ -/* pos 0109: 135 */ 0xE3 /* 'c' -> */, -/* pos 010a: 136 */ 0xE5 /* 'e' -> */, -/* pos 010b: 137 */ 0x70 /* 'p' */, 0x07, 0x00 /* (to 0x0112 state 138) */, - 0x73 /* 's' */, 0x0E, 0x00 /* (to 0x011C state 141) */, +/* pos 00ef: 113 */ 0xB1 /* '1' -> */, +/* pos 00f0: 114 */ 0xAE /* '.' -> */, +/* pos 00f1: 115 */ 0xB1 /* '1' -> */, +/* pos 00f2: 116 */ 0xA0 /* ' ' -> */, +/* pos 00f3: 117 */ 0x00, 0x0F /* - terminal marker 15 - */, +/* pos 00f5: 118 */ 0xAD /* '-' -> */, +/* pos 00f6: 119 */ 0xF3 /* 's' -> */, +/* pos 00f7: 120 */ 0xE5 /* 'e' -> */, +/* pos 00f8: 121 */ 0xF4 /* 't' -> */, +/* pos 00f9: 122 */ 0xF4 /* 't' -> */, +/* pos 00fa: 123 */ 0xE9 /* 'i' -> */, +/* pos 00fb: 124 */ 0xEE /* 'n' -> */, +/* pos 00fc: 125 */ 0xE7 /* 'g' -> */, +/* pos 00fd: 126 */ 0xF3 /* 's' -> */, +/* pos 00fe: 127 */ 0xBA /* ':' -> */, +/* pos 00ff: 128 */ 0x00, 0x10 /* - terminal marker 16 - */, +/* pos 0101: 129 */ 0x63 /* 'c' */, 0x07, 0x00 /* (to 0x0108 state 130) */, + 0x75 /* 'u' */, 0x88, 0x00 /* (to 0x018C state 230) */, 0x08, /* fail */ -/* pos 0112: 138 */ 0xF4 /* 't' -> */, -/* pos 0113: 139 */ 0x3A /* ':' */, 0x07, 0x00 /* (to 0x011A state 140) */, - 0x2D /* '-' */, 0x47, 0x00 /* (to 0x015D state 197) */, +/* pos 0108: 130 */ 0xE3 /* 'c' -> */, +/* pos 0109: 131 */ 0xE5 /* 'e' -> */, +/* pos 010a: 132 */ 0x70 /* 'p' */, 0x07, 0x00 /* (to 0x0111 state 133) */, + 0x73 /* 's' */, 0x0E, 0x00 /* (to 0x011B state 136) */, 0x08, /* fail */ -/* pos 011a: 140 */ 0x00, 0x13 /* - terminal marker 19 - */, -/* pos 011c: 141 */ 0xF3 /* 's' -> */, -/* pos 011d: 142 */ 0xAD /* '-' -> */, -/* pos 011e: 143 */ 0xE3 /* 'c' -> */, -/* pos 011f: 144 */ 0xEF /* 'o' -> */, -/* pos 0120: 145 */ 0xEE /* 'n' -> */, -/* pos 0121: 146 */ 0xF4 /* 't' -> */, -/* pos 0122: 147 */ 0xF2 /* 'r' -> */, -/* pos 0123: 148 */ 0xEF /* 'o' -> */, -/* pos 0124: 149 */ 0xEC /* 'l' -> */, -/* pos 0125: 150 */ 0xAD /* '-' -> */, -/* pos 0126: 151 */ 0xF2 /* 'r' -> */, -/* pos 0127: 152 */ 0xE5 /* 'e' -> */, -/* pos 0128: 153 */ 0xF1 /* 'q' -> */, -/* pos 0129: 154 */ 0xF5 /* 'u' -> */, -/* pos 012a: 155 */ 0xE5 /* 'e' -> */, -/* pos 012b: 156 */ 0xF3 /* 's' -> */, -/* pos 012c: 157 */ 0xF4 /* 't' -> */, -/* pos 012d: 158 */ 0xAD /* '-' -> */, -/* pos 012e: 159 */ 0xE8 /* 'h' -> */, -/* pos 012f: 160 */ 0xE5 /* 'e' -> */, -/* pos 0130: 161 */ 0xE1 /* 'a' -> */, -/* pos 0131: 162 */ 0xE4 /* 'd' -> */, -/* pos 0132: 163 */ 0xE5 /* 'e' -> */, -/* pos 0133: 164 */ 0xF2 /* 'r' -> */, -/* pos 0134: 165 */ 0xF3 /* 's' -> */, -/* pos 0135: 166 */ 0xBA /* ':' -> */, -/* pos 0136: 167 */ 0x00, 0x14 /* - terminal marker 20 - */, -/* pos 0138: 168 */ 0xE6 /* 'f' -> */, -/* pos 0139: 169 */ 0xAD /* '-' -> */, -/* pos 013a: 170 */ 0x6D /* 'm' */, 0x07, 0x00 /* (to 0x0141 state 171) */, - 0x6E /* 'n' */, 0x14, 0x00 /* (to 0x0151 state 186) */, +/* pos 0111: 133 */ 0xF4 /* 't' -> */, +/* pos 0112: 134 */ 0x3A /* ':' */, 0x07, 0x00 /* (to 0x0119 state 135) */, + 0x2D /* '-' */, 0x47, 0x00 /* (to 0x015C state 192) */, 0x08, /* fail */ -/* pos 0141: 171 */ 0xEF /* 'o' -> */, -/* pos 0142: 172 */ 0xE4 /* 'd' -> */, -/* pos 0143: 173 */ 0xE9 /* 'i' -> */, -/* pos 0144: 174 */ 0xE6 /* 'f' -> */, -/* pos 0145: 175 */ 0xE9 /* 'i' -> */, -/* pos 0146: 176 */ 0xE5 /* 'e' -> */, -/* pos 0147: 177 */ 0xE4 /* 'd' -> */, -/* pos 0148: 178 */ 0xAD /* '-' -> */, -/* pos 0149: 179 */ 0xF3 /* 's' -> */, -/* pos 014a: 180 */ 0xE9 /* 'i' -> */, -/* pos 014b: 181 */ 0xEE /* 'n' -> */, -/* pos 014c: 182 */ 0xE3 /* 'c' -> */, -/* pos 014d: 183 */ 0xE5 /* 'e' -> */, -/* pos 014e: 184 */ 0xBA /* ':' -> */, -/* pos 014f: 185 */ 0x00, 0x15 /* - terminal marker 21 - */, -/* pos 0151: 186 */ 0xEF /* 'o' -> */, -/* pos 0152: 187 */ 0xEE /* 'n' -> */, -/* pos 0153: 188 */ 0xE5 /* 'e' -> */, -/* pos 0154: 189 */ 0xAD /* '-' -> */, -/* pos 0155: 190 */ 0xED /* 'm' -> */, -/* pos 0156: 191 */ 0xE1 /* 'a' -> */, -/* pos 0157: 192 */ 0xF4 /* 't' -> */, -/* pos 0158: 193 */ 0xE3 /* 'c' -> */, -/* pos 0159: 194 */ 0xE8 /* 'h' -> */, -/* pos 015a: 195 */ 0xBA /* ':' -> */, -/* pos 015b: 196 */ 0x00, 0x16 /* - terminal marker 22 - */, -/* pos 015d: 197 */ 0x65 /* 'e' */, 0x07, 0x00 /* (to 0x0164 state 198) */, - 0x6C /* 'l' */, 0x0E, 0x00 /* (to 0x016E state 207) */, +/* pos 0119: 135 */ 0x00, 0x11 /* - terminal marker 17 - */, +/* pos 011b: 136 */ 0xF3 /* 's' -> */, +/* pos 011c: 137 */ 0xAD /* '-' -> */, +/* pos 011d: 138 */ 0xE3 /* 'c' -> */, +/* pos 011e: 139 */ 0xEF /* 'o' -> */, +/* pos 011f: 140 */ 0xEE /* 'n' -> */, +/* pos 0120: 141 */ 0xF4 /* 't' -> */, +/* pos 0121: 142 */ 0xF2 /* 'r' -> */, +/* pos 0122: 143 */ 0xEF /* 'o' -> */, +/* pos 0123: 144 */ 0xEC /* 'l' -> */, +/* pos 0124: 145 */ 0xAD /* '-' -> */, +/* pos 0125: 146 */ 0xF2 /* 'r' -> */, +/* pos 0126: 147 */ 0xE5 /* 'e' -> */, +/* pos 0127: 148 */ 0xF1 /* 'q' -> */, +/* pos 0128: 149 */ 0xF5 /* 'u' -> */, +/* pos 0129: 150 */ 0xE5 /* 'e' -> */, +/* pos 012a: 151 */ 0xF3 /* 's' -> */, +/* pos 012b: 152 */ 0xF4 /* 't' -> */, +/* pos 012c: 153 */ 0xAD /* '-' -> */, +/* pos 012d: 154 */ 0xE8 /* 'h' -> */, +/* pos 012e: 155 */ 0xE5 /* 'e' -> */, +/* pos 012f: 156 */ 0xE1 /* 'a' -> */, +/* pos 0130: 157 */ 0xE4 /* 'd' -> */, +/* pos 0131: 158 */ 0xE5 /* 'e' -> */, +/* pos 0132: 159 */ 0xF2 /* 'r' -> */, +/* pos 0133: 160 */ 0xF3 /* 's' -> */, +/* pos 0134: 161 */ 0xBA /* ':' -> */, +/* pos 0135: 162 */ 0x00, 0x12 /* - terminal marker 18 - */, +/* pos 0137: 163 */ 0xE6 /* 'f' -> */, +/* pos 0138: 164 */ 0xAD /* '-' -> */, +/* pos 0139: 165 */ 0x6D /* 'm' */, 0x07, 0x00 /* (to 0x0140 state 166) */, + 0x6E /* 'n' */, 0x14, 0x00 /* (to 0x0150 state 181) */, 0x08, /* fail */ -/* pos 0164: 198 */ 0xEE /* 'n' -> */, -/* pos 0165: 199 */ 0xE3 /* 'c' -> */, -/* pos 0166: 200 */ 0xEF /* 'o' -> */, -/* pos 0167: 201 */ 0xE4 /* 'd' -> */, -/* pos 0168: 202 */ 0xE9 /* 'i' -> */, -/* pos 0169: 203 */ 0xEE /* 'n' -> */, -/* pos 016a: 204 */ 0xE7 /* 'g' -> */, -/* pos 016b: 205 */ 0xBA /* ':' -> */, -/* pos 016c: 206 */ 0x00, 0x17 /* - terminal marker 23 - */, -/* pos 016e: 207 */ 0xE1 /* 'a' -> */, -/* pos 016f: 208 */ 0xEE /* 'n' -> */, -/* pos 0170: 209 */ 0xE7 /* 'g' -> */, -/* pos 0171: 210 */ 0xF5 /* 'u' -> */, -/* pos 0172: 211 */ 0xE1 /* 'a' -> */, -/* pos 0173: 212 */ 0xE7 /* 'g' -> */, -/* pos 0174: 213 */ 0xE5 /* 'e' -> */, -/* pos 0175: 214 */ 0xBA /* ':' -> */, -/* pos 0176: 215 */ 0x00, 0x18 /* - terminal marker 24 - */, -/* pos 0178: 216 */ 0xE1 /* 'a' -> */, -/* pos 0179: 217 */ 0xE7 /* 'g' -> */, -/* pos 017a: 218 */ 0xED /* 'm' -> */, -/* pos 017b: 219 */ 0xE1 /* 'a' -> */, -/* pos 017c: 220 */ 0xBA /* ':' -> */, -/* pos 017d: 221 */ 0x00, 0x19 /* - terminal marker 25 - */, -/* pos 017f: 222 */ 0xE3 /* 'c' -> */, -/* pos 0180: 223 */ 0xE8 /* 'h' -> */, -/* pos 0181: 224 */ 0xE5 /* 'e' -> */, -/* pos 0182: 225 */ 0xAD /* '-' -> */, -/* pos 0183: 226 */ 0xE3 /* 'c' -> */, -/* pos 0184: 227 */ 0xEF /* 'o' -> */, -/* pos 0185: 228 */ 0xEE /* 'n' -> */, -/* pos 0186: 229 */ 0xF4 /* 't' -> */, -/* pos 0187: 230 */ 0xF2 /* 'r' -> */, -/* pos 0188: 231 */ 0xEF /* 'o' -> */, -/* pos 0189: 232 */ 0xEC /* 'l' -> */, -/* pos 018a: 233 */ 0xBA /* ':' -> */, -/* pos 018b: 234 */ 0x00, 0x1A /* - terminal marker 26 - */, -/* pos 018d: 235 */ 0xF4 /* 't' -> */, -/* pos 018e: 236 */ 0xE8 /* 'h' -> */, -/* pos 018f: 237 */ 0xEF /* 'o' -> */, -/* pos 0190: 238 */ 0xF2 /* 'r' -> */, -/* pos 0191: 239 */ 0xE9 /* 'i' -> */, -/* pos 0192: 240 */ 0xFA /* 'z' -> */, -/* pos 0193: 241 */ 0xE1 /* 'a' -> */, -/* pos 0194: 242 */ 0xF4 /* 't' -> */, -/* pos 0195: 243 */ 0xE9 /* 'i' -> */, -/* pos 0196: 244 */ 0xEF /* 'o' -> */, -/* pos 0197: 245 */ 0xEE /* 'n' -> */, -/* pos 0198: 246 */ 0xBA /* ':' -> */, -/* pos 0199: 247 */ 0x00, 0x1B /* - terminal marker 27 - */, -/* pos 019b: 248 */ 0xEB /* 'k' -> */, -/* pos 019c: 249 */ 0xE9 /* 'i' -> */, -/* pos 019d: 250 */ 0xE5 /* 'e' -> */, -/* pos 019e: 251 */ 0xBA /* ':' -> */, -/* pos 019f: 252 */ 0x00, 0x1C /* - terminal marker 28 - */, -/* pos 01a1: 253 */ 0xE5 /* 'e' -> */, -/* pos 01a2: 254 */ 0xEE /* 'n' -> */, -/* pos 01a3: 255 */ 0xF4 /* 't' -> */, -/* pos 01a4: 256 */ 0xAD /* '-' -> */, -/* pos 01a5: 257 */ 0x6C /* 'l' */, 0x07, 0x00 /* (to 0x01AC state 258) */, - 0x74 /* 't' */, 0x0C, 0x00 /* (to 0x01B4 state 265) */, +/* pos 0140: 166 */ 0xEF /* 'o' -> */, +/* pos 0141: 167 */ 0xE4 /* 'd' -> */, +/* pos 0142: 168 */ 0xE9 /* 'i' -> */, +/* pos 0143: 169 */ 0xE6 /* 'f' -> */, +/* pos 0144: 170 */ 0xE9 /* 'i' -> */, +/* pos 0145: 171 */ 0xE5 /* 'e' -> */, +/* pos 0146: 172 */ 0xE4 /* 'd' -> */, +/* pos 0147: 173 */ 0xAD /* '-' -> */, +/* pos 0148: 174 */ 0xF3 /* 's' -> */, +/* pos 0149: 175 */ 0xE9 /* 'i' -> */, +/* pos 014a: 176 */ 0xEE /* 'n' -> */, +/* pos 014b: 177 */ 0xE3 /* 'c' -> */, +/* pos 014c: 178 */ 0xE5 /* 'e' -> */, +/* pos 014d: 179 */ 0xBA /* ':' -> */, +/* pos 014e: 180 */ 0x00, 0x13 /* - terminal marker 19 - */, +/* pos 0150: 181 */ 0xEF /* 'o' -> */, +/* pos 0151: 182 */ 0xEE /* 'n' -> */, +/* pos 0152: 183 */ 0xE5 /* 'e' -> */, +/* pos 0153: 184 */ 0xAD /* '-' -> */, +/* pos 0154: 185 */ 0xED /* 'm' -> */, +/* pos 0155: 186 */ 0xE1 /* 'a' -> */, +/* pos 0156: 187 */ 0xF4 /* 't' -> */, +/* pos 0157: 188 */ 0xE3 /* 'c' -> */, +/* pos 0158: 189 */ 0xE8 /* 'h' -> */, +/* pos 0159: 190 */ 0xBA /* ':' -> */, +/* pos 015a: 191 */ 0x00, 0x14 /* - terminal marker 20 - */, +/* pos 015c: 192 */ 0x65 /* 'e' */, 0x07, 0x00 /* (to 0x0163 state 193) */, + 0x6C /* 'l' */, 0x0E, 0x00 /* (to 0x016D state 202) */, 0x08, /* fail */ -/* pos 01ac: 258 */ 0xE5 /* 'e' -> */, -/* pos 01ad: 259 */ 0xEE /* 'n' -> */, -/* pos 01ae: 260 */ 0xE7 /* 'g' -> */, -/* pos 01af: 261 */ 0xF4 /* 't' -> */, -/* pos 01b0: 262 */ 0xE8 /* 'h' -> */, -/* pos 01b1: 263 */ 0xBA /* ':' -> */, -/* pos 01b2: 264 */ 0x00, 0x1D /* - terminal marker 29 - */, -/* pos 01b4: 265 */ 0xF9 /* 'y' -> */, -/* pos 01b5: 266 */ 0xF0 /* 'p' -> */, -/* pos 01b6: 267 */ 0xE5 /* 'e' -> */, -/* pos 01b7: 268 */ 0xBA /* ':' -> */, -/* pos 01b8: 269 */ 0x00, 0x1E /* - terminal marker 30 - */, -/* pos 01ba: 270 */ 0xE1 /* 'a' -> */, -/* pos 01bb: 271 */ 0xF4 /* 't' -> */, -/* pos 01bc: 272 */ 0xE5 /* 'e' -> */, -/* pos 01bd: 273 */ 0xBA /* ':' -> */, -/* pos 01be: 274 */ 0x00, 0x1F /* - terminal marker 31 - */, -/* pos 01c0: 275 */ 0x61 /* 'a' */, 0x07, 0x00 /* (to 0x01C7 state 276) */, - 0x65 /* 'e' */, 0x0A, 0x00 /* (to 0x01CD state 281) */, +/* pos 0163: 193 */ 0xEE /* 'n' -> */, +/* pos 0164: 194 */ 0xE3 /* 'c' -> */, +/* pos 0165: 195 */ 0xEF /* 'o' -> */, +/* pos 0166: 196 */ 0xE4 /* 'd' -> */, +/* pos 0167: 197 */ 0xE9 /* 'i' -> */, +/* pos 0168: 198 */ 0xEE /* 'n' -> */, +/* pos 0169: 199 */ 0xE7 /* 'g' -> */, +/* pos 016a: 200 */ 0xBA /* ':' -> */, +/* pos 016b: 201 */ 0x00, 0x15 /* - terminal marker 21 - */, +/* pos 016d: 202 */ 0xE1 /* 'a' -> */, +/* pos 016e: 203 */ 0xEE /* 'n' -> */, +/* pos 016f: 204 */ 0xE7 /* 'g' -> */, +/* pos 0170: 205 */ 0xF5 /* 'u' -> */, +/* pos 0171: 206 */ 0xE1 /* 'a' -> */, +/* pos 0172: 207 */ 0xE7 /* 'g' -> */, +/* pos 0173: 208 */ 0xE5 /* 'e' -> */, +/* pos 0174: 209 */ 0xBA /* ':' -> */, +/* pos 0175: 210 */ 0x00, 0x16 /* - terminal marker 22 - */, +/* pos 0177: 211 */ 0xE1 /* 'a' -> */, +/* pos 0178: 212 */ 0xE7 /* 'g' -> */, +/* pos 0179: 213 */ 0xED /* 'm' -> */, +/* pos 017a: 214 */ 0xE1 /* 'a' -> */, +/* pos 017b: 215 */ 0xBA /* ':' -> */, +/* pos 017c: 216 */ 0x00, 0x17 /* - terminal marker 23 - */, +/* pos 017e: 217 */ 0xE3 /* 'c' -> */, +/* pos 017f: 218 */ 0xE8 /* 'h' -> */, +/* pos 0180: 219 */ 0xE5 /* 'e' -> */, +/* pos 0181: 220 */ 0xAD /* '-' -> */, +/* pos 0182: 221 */ 0xE3 /* 'c' -> */, +/* pos 0183: 222 */ 0xEF /* 'o' -> */, +/* pos 0184: 223 */ 0xEE /* 'n' -> */, +/* pos 0185: 224 */ 0xF4 /* 't' -> */, +/* pos 0186: 225 */ 0xF2 /* 'r' -> */, +/* pos 0187: 226 */ 0xEF /* 'o' -> */, +/* pos 0188: 227 */ 0xEC /* 'l' -> */, +/* pos 0189: 228 */ 0xBA /* ':' -> */, +/* pos 018a: 229 */ 0x00, 0x18 /* - terminal marker 24 - */, +/* pos 018c: 230 */ 0xF4 /* 't' -> */, +/* pos 018d: 231 */ 0xE8 /* 'h' -> */, +/* pos 018e: 232 */ 0xEF /* 'o' -> */, +/* pos 018f: 233 */ 0xF2 /* 'r' -> */, +/* pos 0190: 234 */ 0xE9 /* 'i' -> */, +/* pos 0191: 235 */ 0xFA /* 'z' -> */, +/* pos 0192: 236 */ 0xE1 /* 'a' -> */, +/* pos 0193: 237 */ 0xF4 /* 't' -> */, +/* pos 0194: 238 */ 0xE9 /* 'i' -> */, +/* pos 0195: 239 */ 0xEF /* 'o' -> */, +/* pos 0196: 240 */ 0xEE /* 'n' -> */, +/* pos 0197: 241 */ 0xBA /* ':' -> */, +/* pos 0198: 242 */ 0x00, 0x19 /* - terminal marker 25 - */, +/* pos 019a: 243 */ 0xEB /* 'k' -> */, +/* pos 019b: 244 */ 0xE9 /* 'i' -> */, +/* pos 019c: 245 */ 0xE5 /* 'e' -> */, +/* pos 019d: 246 */ 0xBA /* ':' -> */, +/* pos 019e: 247 */ 0x00, 0x1A /* - terminal marker 26 - */, +/* pos 01a0: 248 */ 0xE5 /* 'e' -> */, +/* pos 01a1: 249 */ 0xEE /* 'n' -> */, +/* pos 01a2: 250 */ 0xF4 /* 't' -> */, +/* pos 01a3: 251 */ 0xAD /* '-' -> */, +/* pos 01a4: 252 */ 0x6C /* 'l' */, 0x07, 0x00 /* (to 0x01AB state 253) */, + 0x74 /* 't' */, 0x0C, 0x00 /* (to 0x01B3 state 260) */, 0x08, /* fail */ -/* pos 01c7: 276 */ 0xEE /* 'n' -> */, -/* pos 01c8: 277 */ 0xE7 /* 'g' -> */, -/* pos 01c9: 278 */ 0xE5 /* 'e' -> */, -/* pos 01ca: 279 */ 0xBA /* ':' -> */, -/* pos 01cb: 280 */ 0x00, 0x20 /* - terminal marker 32 - */, -/* pos 01cd: 281 */ 0xE6 /* 'f' -> */, -/* pos 01ce: 282 */ 0xE5 /* 'e' -> */, -/* pos 01cf: 283 */ 0xF2 /* 'r' -> */, -/* pos 01d0: 284 */ 0xE5 /* 'e' -> */, -/* pos 01d1: 285 */ 0xF2 /* 'r' -> */, -/* pos 01d2: 286 */ 0xBA /* ':' -> */, -/* pos 01d3: 287 */ 0x00, 0x21 /* - terminal marker 33 - */, -/* total size 469 bytes */ +/* pos 01ab: 253 */ 0xE5 /* 'e' -> */, +/* pos 01ac: 254 */ 0xEE /* 'n' -> */, +/* pos 01ad: 255 */ 0xE7 /* 'g' -> */, +/* pos 01ae: 256 */ 0xF4 /* 't' -> */, +/* pos 01af: 257 */ 0xE8 /* 'h' -> */, +/* pos 01b0: 258 */ 0xBA /* ':' -> */, +/* pos 01b1: 259 */ 0x00, 0x1B /* - terminal marker 27 - */, +/* pos 01b3: 260 */ 0xF9 /* 'y' -> */, +/* pos 01b4: 261 */ 0xF0 /* 'p' -> */, +/* pos 01b5: 262 */ 0xE5 /* 'e' -> */, +/* pos 01b6: 263 */ 0xBA /* ':' -> */, +/* pos 01b7: 264 */ 0x00, 0x1C /* - terminal marker 28 - */, +/* pos 01b9: 265 */ 0xE1 /* 'a' -> */, +/* pos 01ba: 266 */ 0xF4 /* 't' -> */, +/* pos 01bb: 267 */ 0xE5 /* 'e' -> */, +/* pos 01bc: 268 */ 0xBA /* ':' -> */, +/* pos 01bd: 269 */ 0x00, 0x1D /* - terminal marker 29 - */, +/* pos 01bf: 270 */ 0x61 /* 'a' */, 0x07, 0x00 /* (to 0x01C6 state 271) */, + 0x65 /* 'e' */, 0x0A, 0x00 /* (to 0x01CC state 276) */, + 0x08, /* fail */ +/* pos 01c6: 271 */ 0xEE /* 'n' -> */, +/* pos 01c7: 272 */ 0xE7 /* 'g' -> */, +/* pos 01c8: 273 */ 0xE5 /* 'e' -> */, +/* pos 01c9: 274 */ 0xBA /* ':' -> */, +/* pos 01ca: 275 */ 0x00, 0x1E /* - terminal marker 30 - */, +/* pos 01cc: 276 */ 0xE6 /* 'f' -> */, +/* pos 01cd: 277 */ 0xE5 /* 'e' -> */, +/* pos 01ce: 278 */ 0xF2 /* 'r' -> */, +/* pos 01cf: 279 */ 0xE5 /* 'e' -> */, +/* pos 01d0: 280 */ 0xF2 /* 'r' -> */, +/* pos 01d1: 281 */ 0xBA /* ':' -> */, +/* pos 01d2: 282 */ 0x00, 0x1F /* - terminal marker 31 - */, +/* pos 01d4: 283 */ 0x00, 0x20 /* - terminal marker 32 - */, +/* pos 01d6: 284 */ 0xE5 /* 'e' -> */, +/* pos 01d7: 285 */ 0xF2 /* 'r' -> */, +/* pos 01d8: 286 */ 0xF3 /* 's' -> */, +/* pos 01d9: 287 */ 0xE9 /* 'i' -> */, +/* pos 01da: 288 */ 0xEF /* 'o' -> */, +/* pos 01db: 289 */ 0xEE /* 'n' -> */, +/* pos 01dc: 290 */ 0xBA /* ':' -> */, +/* pos 01dd: 291 */ 0x00, 0x21 /* - terminal marker 33 - */, +/* pos 01df: 292 */ 0xF2 /* 'r' -> */, +/* pos 01e0: 293 */ 0xE9 /* 'i' -> */, +/* pos 01e1: 294 */ 0xE7 /* 'g' -> */, +/* pos 01e2: 295 */ 0xE9 /* 'i' -> */, +/* pos 01e3: 296 */ 0xEE /* 'n' -> */, +/* pos 01e4: 297 */ 0xBA /* ':' -> */, +/* pos 01e5: 298 */ 0x00, 0x22 /* - terminal marker 34 - */, +/* total size 487 bytes */ diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h index 6f3425a7..cbd1ce55 100644 --- a/lib/libwebsockets.h +++ b/lib/libwebsockets.h @@ -280,7 +280,11 @@ struct lws_tokens { int token_len; }; -/* don't forget to update test server header dump accordingly */ +/* + * don't forget to update test server header dump accordingly + * + * these have to be kept in sync with lextable.h / minilex.c + */ enum lws_token_indexes { WSI_TOKEN_GET_URI, @@ -288,28 +292,18 @@ enum lws_token_indexes { WSI_TOKEN_OPTIONS_URI, WSI_TOKEN_HOST, WSI_TOKEN_CONNECTION, - WSI_TOKEN_KEY1, - WSI_TOKEN_KEY2, - WSI_TOKEN_PROTOCOL, WSI_TOKEN_UPGRADE, WSI_TOKEN_ORIGIN, WSI_TOKEN_DRAFT, WSI_TOKEN_CHALLENGE, - - /* new for 04 */ - WSI_TOKEN_KEY, - WSI_TOKEN_VERSION, - WSI_TOKEN_SWORIGIN, - - /* new for 05 */ WSI_TOKEN_EXTENSIONS, - - /* client receives these */ + WSI_TOKEN_KEY1, + WSI_TOKEN_KEY2, + WSI_TOKEN_PROTOCOL, WSI_TOKEN_ACCEPT, WSI_TOKEN_NONCE, WSI_TOKEN_HTTP, - - /* http-related */ + WSI_TOKEN_HTTP2_SETTINGS, WSI_TOKEN_HTTP_ACCEPT, WSI_TOKEN_HTTP_AC_REQUEST_HEADERS, WSI_TOKEN_HTTP_IF_MODIFIED_SINCE, @@ -325,8 +319,11 @@ enum lws_token_indexes { WSI_TOKEN_HTTP_DATE, WSI_TOKEN_HTTP_RANGE, WSI_TOKEN_HTTP_REFERER, - WSI_TOKEN_HTTP_URI_ARGS, + WSI_TOKEN_KEY, + WSI_TOKEN_VERSION, + WSI_TOKEN_SWORIGIN, + WSI_TOKEN_HTTP_URI_ARGS, WSI_TOKEN_MUXURL, diff --git a/lib/minilex.c b/lib/minilex.c index cdc500ed..f3516d61 100644 --- a/lib/minilex.c +++ b/lib/minilex.c @@ -24,23 +24,20 @@ const char *set[] = { "options ", "host:", "connection:", - "sec-websocket-key1:", - "sec-websocket-key2:", - "sec-websocket-protocol:", "upgrade:", "origin:", "sec-websocket-draft:", "\x0d\x0a", - "sec-websocket-key:", - "sec-websocket-version:", - "sec-websocket-origin:", - "sec-websocket-extensions:", + "sec-websocket-key1:", + "sec-websocket-key2:", + "sec-websocket-protocol:", "sec-websocket-accept:", "sec-websocket-nonce:", "http/1.1 ", + "http2-settings:", "accept:", "access-control-request-headers:", @@ -57,6 +54,10 @@ const char *set[] = { "date:", "range:", "referer:", + "sec-websocket-key:", + "sec-websocket-version:", + "sec-websocket-origin:", + "", /* not matchable */ }; diff --git a/test-server/test-server.c b/test-server/test-server.c index 2d17175f..1a820994 100644 --- a/test-server/test-server.c +++ b/test-server/test-server.c @@ -132,7 +132,7 @@ dump_handshake_info(struct libwebsocket *wsi) /*[WSI_TOKEN_ACCEPT] =*/ "Accept", /*[WSI_TOKEN_NONCE] =*/ "Nonce", /*[WSI_TOKEN_HTTP] =*/ "Http", - + "http2-settings", "Accept:", "a-c-request-headers:", "If-Modified-Since:",