Work on huffman decoding

This commit is contained in:
Carl Lerche
2017-03-13 14:00:22 -07:00
parent 490ae8c05d
commit 73706494ef
7 changed files with 22052 additions and 223 deletions

527
src/bin/genhuff.rs Normal file
View File

@@ -0,0 +1,527 @@
use std::cell::RefCell;
struct Node {
id: Option<usize>,
left: Option<Box<Node>>,
right: Option<Box<Node>>,
terminal: Option<u8>,
maybe_eos: bool,
transitions: RefCell<Vec<Transition>>,
}
#[derive(Debug, Default, Copy, Clone)]
struct Transition {
target: usize,
byte: Option<u8>,
maybe_eos: bool,
}
const TABLE: &'static str = r##"
( 0) |11111111|11000 1ff8 [13]
( 1) |11111111|11111111|1011000 7fffd8 [23]
( 2) |11111111|11111111|11111110|0010 fffffe2 [28]
( 3) |11111111|11111111|11111110|0011 fffffe3 [28]
( 4) |11111111|11111111|11111110|0100 fffffe4 [28]
( 5) |11111111|11111111|11111110|0101 fffffe5 [28]
( 6) |11111111|11111111|11111110|0110 fffffe6 [28]
( 7) |11111111|11111111|11111110|0111 fffffe7 [28]
( 8) |11111111|11111111|11111110|1000 fffffe8 [28]
( 9) |11111111|11111111|11101010 ffffea [24]
( 10) |11111111|11111111|11111111|111100 3ffffffc [30]
( 11) |11111111|11111111|11111110|1001 fffffe9 [28]
( 12) |11111111|11111111|11111110|1010 fffffea [28]
( 13) |11111111|11111111|11111111|111101 3ffffffd [30]
( 14) |11111111|11111111|11111110|1011 fffffeb [28]
( 15) |11111111|11111111|11111110|1100 fffffec [28]
( 16) |11111111|11111111|11111110|1101 fffffed [28]
( 17) |11111111|11111111|11111110|1110 fffffee [28]
( 18) |11111111|11111111|11111110|1111 fffffef [28]
( 19) |11111111|11111111|11111111|0000 ffffff0 [28]
( 20) |11111111|11111111|11111111|0001 ffffff1 [28]
( 21) |11111111|11111111|11111111|0010 ffffff2 [28]
( 22) |11111111|11111111|11111111|111110 3ffffffe [30]
( 23) |11111111|11111111|11111111|0011 ffffff3 [28]
( 24) |11111111|11111111|11111111|0100 ffffff4 [28]
( 25) |11111111|11111111|11111111|0101 ffffff5 [28]
( 26) |11111111|11111111|11111111|0110 ffffff6 [28]
( 27) |11111111|11111111|11111111|0111 ffffff7 [28]
( 28) |11111111|11111111|11111111|1000 ffffff8 [28]
( 29) |11111111|11111111|11111111|1001 ffffff9 [28]
( 30) |11111111|11111111|11111111|1010 ffffffa [28]
( 31) |11111111|11111111|11111111|1011 ffffffb [28]
' ' ( 32) |010100 14 [ 6]
'!' ( 33) |11111110|00 3f8 [10]
'"' ( 34) |11111110|01 3f9 [10]
'#' ( 35) |11111111|1010 ffa [12]
'$' ( 36) |11111111|11001 1ff9 [13]
'%' ( 37) |010101 15 [ 6]
'&' ( 38) |11111000 f8 [ 8]
''' ( 39) |11111111|010 7fa [11]
'(' ( 40) |11111110|10 3fa [10]
')' ( 41) |11111110|11 3fb [10]
'*' ( 42) |11111001 f9 [ 8]
'+' ( 43) |11111111|011 7fb [11]
',' ( 44) |11111010 fa [ 8]
'-' ( 45) |010110 16 [ 6]
'.' ( 46) |010111 17 [ 6]
'/' ( 47) |011000 18 [ 6]
'0' ( 48) |00000 0 [ 5]
'1' ( 49) |00001 1 [ 5]
'2' ( 50) |00010 2 [ 5]
'3' ( 51) |011001 19 [ 6]
'4' ( 52) |011010 1a [ 6]
'5' ( 53) |011011 1b [ 6]
'6' ( 54) |011100 1c [ 6]
'7' ( 55) |011101 1d [ 6]
'8' ( 56) |011110 1e [ 6]
'9' ( 57) |011111 1f [ 6]
':' ( 58) |1011100 5c [ 7]
';' ( 59) |11111011 fb [ 8]
'<' ( 60) |11111111|1111100 7ffc [15]
'=' ( 61) |100000 20 [ 6]
'>' ( 62) |11111111|1011 ffb [12]
'?' ( 63) |11111111|00 3fc [10]
'@' ( 64) |11111111|11010 1ffa [13]
'A' ( 65) |100001 21 [ 6]
'B' ( 66) |1011101 5d [ 7]
'C' ( 67) |1011110 5e [ 7]
'D' ( 68) |1011111 5f [ 7]
'E' ( 69) |1100000 60 [ 7]
'F' ( 70) |1100001 61 [ 7]
'G' ( 71) |1100010 62 [ 7]
'H' ( 72) |1100011 63 [ 7]
'I' ( 73) |1100100 64 [ 7]
'J' ( 74) |1100101 65 [ 7]
'K' ( 75) |1100110 66 [ 7]
'L' ( 76) |1100111 67 [ 7]
'M' ( 77) |1101000 68 [ 7]
'N' ( 78) |1101001 69 [ 7]
'O' ( 79) |1101010 6a [ 7]
'P' ( 80) |1101011 6b [ 7]
'Q' ( 81) |1101100 6c [ 7]
'R' ( 82) |1101101 6d [ 7]
'S' ( 83) |1101110 6e [ 7]
'T' ( 84) |1101111 6f [ 7]
'U' ( 85) |1110000 70 [ 7]
'V' ( 86) |1110001 71 [ 7]
'W' ( 87) |1110010 72 [ 7]
'X' ( 88) |11111100 fc [ 8]
'Y' ( 89) |1110011 73 [ 7]
'Z' ( 90) |11111101 fd [ 8]
'[' ( 91) |11111111|11011 1ffb [13]
'\' ( 92) |11111111|11111110|000 7fff0 [19]
']' ( 93) |11111111|11100 1ffc [13]
'^' ( 94) |11111111|111100 3ffc [14]
'_' ( 95) |100010 22 [ 6]
'`' ( 96) |11111111|1111101 7ffd [15]
'a' ( 97) |00011 3 [ 5]
'b' ( 98) |100011 23 [ 6]
'c' ( 99) |00100 4 [ 5]
'd' (100) |100100 24 [ 6]
'e' (101) |00101 5 [ 5]
'f' (102) |100101 25 [ 6]
'g' (103) |100110 26 [ 6]
'h' (104) |100111 27 [ 6]
'i' (105) |00110 6 [ 5]
'j' (106) |1110100 74 [ 7]
'k' (107) |1110101 75 [ 7]
'l' (108) |101000 28 [ 6]
'm' (109) |101001 29 [ 6]
'n' (110) |101010 2a [ 6]
'o' (111) |00111 7 [ 5]
'p' (112) |101011 2b [ 6]
'q' (113) |1110110 76 [ 7]
'r' (114) |101100 2c [ 6]
's' (115) |01000 8 [ 5]
't' (116) |01001 9 [ 5]
'u' (117) |101101 2d [ 6]
'v' (118) |1110111 77 [ 7]
'w' (119) |1111000 78 [ 7]
'x' (120) |1111001 79 [ 7]
'y' (121) |1111010 7a [ 7]
'z' (122) |1111011 7b [ 7]
'{' (123) |11111111|1111110 7ffe [15]
'|' (124) |11111111|100 7fc [11]
'}' (125) |11111111|111101 3ffd [14]
'~' (126) |11111111|11101 1ffd [13]
(127) |11111111|11111111|11111111|1100 ffffffc [28]
(128) |11111111|11111110|0110 fffe6 [20]
(129) |11111111|11111111|010010 3fffd2 [22]
(130) |11111111|11111110|0111 fffe7 [20]
(131) |11111111|11111110|1000 fffe8 [20]
(132) |11111111|11111111|010011 3fffd3 [22]
(133) |11111111|11111111|010100 3fffd4 [22]
(134) |11111111|11111111|010101 3fffd5 [22]
(135) |11111111|11111111|1011001 7fffd9 [23]
(136) |11111111|11111111|010110 3fffd6 [22]
(137) |11111111|11111111|1011010 7fffda [23]
(138) |11111111|11111111|1011011 7fffdb [23]
(139) |11111111|11111111|1011100 7fffdc [23]
(140) |11111111|11111111|1011101 7fffdd [23]
(141) |11111111|11111111|1011110 7fffde [23]
(142) |11111111|11111111|11101011 ffffeb [24]
(143) |11111111|11111111|1011111 7fffdf [23]
(144) |11111111|11111111|11101100 ffffec [24]
(145) |11111111|11111111|11101101 ffffed [24]
(146) |11111111|11111111|010111 3fffd7 [22]
(147) |11111111|11111111|1100000 7fffe0 [23]
(148) |11111111|11111111|11101110 ffffee [24]
(149) |11111111|11111111|1100001 7fffe1 [23]
(150) |11111111|11111111|1100010 7fffe2 [23]
(151) |11111111|11111111|1100011 7fffe3 [23]
(152) |11111111|11111111|1100100 7fffe4 [23]
(153) |11111111|11111110|11100 1fffdc [21]
(154) |11111111|11111111|011000 3fffd8 [22]
(155) |11111111|11111111|1100101 7fffe5 [23]
(156) |11111111|11111111|011001 3fffd9 [22]
(157) |11111111|11111111|1100110 7fffe6 [23]
(158) |11111111|11111111|1100111 7fffe7 [23]
(159) |11111111|11111111|11101111 ffffef [24]
(160) |11111111|11111111|011010 3fffda [22]
(161) |11111111|11111110|11101 1fffdd [21]
(162) |11111111|11111110|1001 fffe9 [20]
(163) |11111111|11111111|011011 3fffdb [22]
(164) |11111111|11111111|011100 3fffdc [22]
(165) |11111111|11111111|1101000 7fffe8 [23]
(166) |11111111|11111111|1101001 7fffe9 [23]
(167) |11111111|11111110|11110 1fffde [21]
(168) |11111111|11111111|1101010 7fffea [23]
(169) |11111111|11111111|011101 3fffdd [22]
(170) |11111111|11111111|011110 3fffde [22]
(171) |11111111|11111111|11110000 fffff0 [24]
(172) |11111111|11111110|11111 1fffdf [21]
(173) |11111111|11111111|011111 3fffdf [22]
(174) |11111111|11111111|1101011 7fffeb [23]
(175) |11111111|11111111|1101100 7fffec [23]
(176) |11111111|11111111|00000 1fffe0 [21]
(177) |11111111|11111111|00001 1fffe1 [21]
(178) |11111111|11111111|100000 3fffe0 [22]
(179) |11111111|11111111|00010 1fffe2 [21]
(180) |11111111|11111111|1101101 7fffed [23]
(181) |11111111|11111111|100001 3fffe1 [22]
(182) |11111111|11111111|1101110 7fffee [23]
(183) |11111111|11111111|1101111 7fffef [23]
(184) |11111111|11111110|1010 fffea [20]
(185) |11111111|11111111|100010 3fffe2 [22]
(186) |11111111|11111111|100011 3fffe3 [22]
(187) |11111111|11111111|100100 3fffe4 [22]
(188) |11111111|11111111|1110000 7ffff0 [23]
(189) |11111111|11111111|100101 3fffe5 [22]
(190) |11111111|11111111|100110 3fffe6 [22]
(191) |11111111|11111111|1110001 7ffff1 [23]
(192) |11111111|11111111|11111000|00 3ffffe0 [26]
(193) |11111111|11111111|11111000|01 3ffffe1 [26]
(194) |11111111|11111110|1011 fffeb [20]
(195) |11111111|11111110|001 7fff1 [19]
(196) |11111111|11111111|100111 3fffe7 [22]
(197) |11111111|11111111|1110010 7ffff2 [23]
(198) |11111111|11111111|101000 3fffe8 [22]
(199) |11111111|11111111|11110110|0 1ffffec [25]
(200) |11111111|11111111|11111000|10 3ffffe2 [26]
(201) |11111111|11111111|11111000|11 3ffffe3 [26]
(202) |11111111|11111111|11111001|00 3ffffe4 [26]
(203) |11111111|11111111|11111011|110 7ffffde [27]
(204) |11111111|11111111|11111011|111 7ffffdf [27]
(205) |11111111|11111111|11111001|01 3ffffe5 [26]
(206) |11111111|11111111|11110001 fffff1 [24]
(207) |11111111|11111111|11110110|1 1ffffed [25]
(208) |11111111|11111110|010 7fff2 [19]
(209) |11111111|11111111|00011 1fffe3 [21]
(210) |11111111|11111111|11111001|10 3ffffe6 [26]
(211) |11111111|11111111|11111100|000 7ffffe0 [27]
(212) |11111111|11111111|11111100|001 7ffffe1 [27]
(213) |11111111|11111111|11111001|11 3ffffe7 [26]
(214) |11111111|11111111|11111100|010 7ffffe2 [27]
(215) |11111111|11111111|11110010 fffff2 [24]
(216) |11111111|11111111|00100 1fffe4 [21]
(217) |11111111|11111111|00101 1fffe5 [21]
(218) |11111111|11111111|11111010|00 3ffffe8 [26]
(219) |11111111|11111111|11111010|01 3ffffe9 [26]
(220) |11111111|11111111|11111111|1101 ffffffd [28]
(221) |11111111|11111111|11111100|011 7ffffe3 [27]
(222) |11111111|11111111|11111100|100 7ffffe4 [27]
(223) |11111111|11111111|11111100|101 7ffffe5 [27]
(224) |11111111|11111110|1100 fffec [20]
(225) |11111111|11111111|11110011 fffff3 [24]
(226) |11111111|11111110|1101 fffed [20]
(227) |11111111|11111111|00110 1fffe6 [21]
(228) |11111111|11111111|101001 3fffe9 [22]
(229) |11111111|11111111|00111 1fffe7 [21]
(230) |11111111|11111111|01000 1fffe8 [21]
(231) |11111111|11111111|1110011 7ffff3 [23]
(232) |11111111|11111111|101010 3fffea [22]
(233) |11111111|11111111|101011 3fffeb [22]
(234) |11111111|11111111|11110111|0 1ffffee [25]
(235) |11111111|11111111|11110111|1 1ffffef [25]
(236) |11111111|11111111|11110100 fffff4 [24]
(237) |11111111|11111111|11110101 fffff5 [24]
(238) |11111111|11111111|11111010|10 3ffffea [26]
(239) |11111111|11111111|1110100 7ffff4 [23]
(240) |11111111|11111111|11111010|11 3ffffeb [26]
(241) |11111111|11111111|11111100|110 7ffffe6 [27]
(242) |11111111|11111111|11111011|00 3ffffec [26]
(243) |11111111|11111111|11111011|01 3ffffed [26]
(244) |11111111|11111111|11111100|111 7ffffe7 [27]
(245) |11111111|11111111|11111101|000 7ffffe8 [27]
(246) |11111111|11111111|11111101|001 7ffffe9 [27]
(247) |11111111|11111111|11111101|010 7ffffea [27]
(248) |11111111|11111111|11111101|011 7ffffeb [27]
(249) |11111111|11111111|11111111|1110 ffffffe [28]
(250) |11111111|11111111|11111101|100 7ffffec [27]
(251) |11111111|11111111|11111101|101 7ffffed [27]
(252) |11111111|11111111|11111101|110 7ffffee [27]
(253) |11111111|11111111|11111101|111 7ffffef [27]
(254) |11111111|11111111|11111110|000 7fffff0 [27]
(255) |11111111|11111111|11111011|10 3ffffee [26]
EOS (256) |11111111|11111111|11111111|111111 3fffffff [30]"##;
const VALID_NAME_CHAR: &'static [u8] = &[
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0-31
0,1,0,1,1,1,1,1,0,0,1,1,0,1,1,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0, // 32-63
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1, // 64-95
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,0,1,0, // 96-127
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 128-159
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 160-191
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 192-223
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 224-255
];
const VALID_VALUE_CHAR: &'static [u8] = &[
0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0-31
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 32-63
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 64-95
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0, // 96-127
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 128-159
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 160-191
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 192-223
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 224-255
];
impl Node {
fn new(byte: u8, code: &[bool]) -> Box<Node> {
let mut node = Box::new(Node {
id: None,
left: None,
right: None,
terminal: None,
maybe_eos: false,
transitions: Default::default(),
});
node.insert(byte, code);
node
}
fn insert(&mut self, byte: u8, code: &[bool]) {
if code.is_empty() {
self.terminal = Some(byte);
return;
}
let (head, rest) = code.split_at(1);
if !head[0] {
match self.left {
Some(ref mut node) => {
node.insert(byte, rest);
}
None => {
self.left = Some(Node::new(byte, rest));
}
}
} else {
match self.right {
Some(ref mut node) => {
node.insert(byte, rest);
}
None => {
self.right = Some(Node::new(byte, rest));
}
}
}
}
fn set_id(&mut self, next_id: &mut usize, prefix: &mut Vec<bool>) {
if self.terminal.is_some() {
return;
}
if prefix.len() <= 7 && prefix.iter().all(|i| *i) {
self.maybe_eos = true;
}
let id = *next_id;
*next_id = id + 1;
self.id = Some(id);
if let Some(ref mut node) = self.left {
prefix.push(false);
node.set_id(next_id, prefix);
prefix.pop();
}
if let Some(ref mut node) = self.right {
prefix.push(true);
node.set_id(next_id, prefix);
prefix.pop();
}
}
fn compute_transitions(&self, root: &Node) {
self.compute_transition(None, self, root, 4);
if let Some(ref node) = self.left {
node.compute_transitions(root);
}
if let Some(ref node) = self.right {
node.compute_transitions(root);
}
}
fn compute_transition(&self,
byte: Option<u8>,
start: &Node,
root: &Node,
steps_remaining: usize)
{
let mut next = self;
if self.terminal.is_some() {
next = root;
}
if steps_remaining == 0 {
start.transitions.borrow_mut().push(Transition {
target: next.id.unwrap(),
byte: byte,
maybe_eos: next.maybe_eos,
});
return;
}
assert!(next.left.is_some());
assert!(next.right.is_some());
for node in &[next.left.as_ref().unwrap(), next.right.as_ref().unwrap()] {
let byte = match node.terminal {
Some(b) => {
assert!(byte.is_none());
Some(b)
}
None => byte,
};
node.compute_transition(byte, start, root, steps_remaining - 1);
}
}
fn print(&self) {
const NGHTTP2_HUFF_ACCEPTED: usize = 1;
const NGHTTP2_HUFF_SYM: usize = 1 << 1;
const NGHTTP2_HUFF_FAIL: usize = 1 << 2;
const NGHTTP2_HUFF_INVALID_FOR_HEADER_NAME: usize = 1 << 3;
const NGHTTP2_HUFF_INVALID_FOR_HEADER_VALUE: usize = 1 << 4;
const NGHTTP2_HUFF_UPPER_CASE_CHAR: usize = 1 << 5;
if self.terminal.is_some() {
return;
}
println!(" // {}", self.id.unwrap());
println!(" [");
for transition in self.transitions.borrow().iter() {
let mut flags = 0;
let mut out = 0;
let mut target = transition.target;
if let Some(byte) = transition.byte {
out = byte;
flags |= NGHTTP2_HUFF_SYM;
if VALID_NAME_CHAR[byte as usize] == 0 {
flags |= NGHTTP2_HUFF_INVALID_FOR_HEADER_NAME;
}
if VALID_VALUE_CHAR[byte as usize] == 0 {
flags |= NGHTTP2_HUFF_INVALID_FOR_HEADER_VALUE;
}
// TODO: Add other flags
}
if transition.maybe_eos {
flags |= NGHTTP2_HUFF_ACCEPTED;
}
println!(" HuffmanState {{");
println!(" next: {},", target);
println!(" byte: {},", out);
println!(" flags: {},", flags);
println!(" }},");
}
println!(" ],");
self.left.as_ref().unwrap().print();
self.right.as_ref().unwrap().print();
}
}
/// Returns root of tree
fn load_table() -> Box<Node> {
let mut lines = TABLE.lines();
let mut root: Option<Box<Node>> = None;
// Skip the first line, which is empty
lines.next();
for (i, line) in lines.enumerate() {
let mut bits: Vec<bool> = vec![];
for &b in &line.as_bytes()[12..45] {
match b {
b'1' => bits.push(true),
b'0' => bits.push(false),
b'|' | b' ' => {}
_ => panic!("unexpected byte; {:?}", b),
}
}
match root {
Some(ref mut node) => {
node.insert(i as u8, &bits);
}
None => {
root = Some(Node::new(i as u8, &bits));
}
}
}
// Assign IDs to all state transition nodes
let mut root = root.unwrap();
let mut id = 0;
root.set_id(&mut id, &mut vec![]);
// Compute transitions for each node
root.compute_transitions(&root);
root
}
pub fn main() {
let table = load_table();
println!("// !!! DO NOT EDIT !!! Generated by src/bin/genhuff.rs");
println!("");
println!(r##"use super::huffman::HuffmanState;"##);
println!("");
println!("const HUFFMAN_DECODE_TABLE: [[HuffmanState; 16]; 256] = [");
table.print();
println!("];");
}

View File

@@ -1,6 +1,6 @@
use super::Entry;
use tower::http::{HeaderName, Str};
use tower::http::{HeaderName, StatusCode, Method, Str};
use bytes::{Buf, Bytes};
use std::io::Cursor;
@@ -19,6 +19,7 @@ pub struct Decoder {
pub enum DecoderError {
InvalidRepresentation,
InvalidIntegerPrefix,
InvalidTableIndex,
IntegerUnderflow,
IntegerOverflow,
}
@@ -133,7 +134,7 @@ impl Decoder {
/// Decodes the headers found in the given buffer.
pub fn decode<F>(&mut self, src: &Bytes, mut f: F) -> Result<(), DecoderError>
where F: FnMut(HeaderName, Str)
where F: FnMut(Entry)
{
use self::Representation::*;
@@ -145,7 +146,7 @@ impl Decoder {
// determined from the first byte.
match try!(Representation::load(peek_u8(&mut buf))) {
Indexed => {
unimplemented!();
f(try!(self.decode_indexed(&mut buf)));
}
LiteralWithIndexing => {
unimplemented!();
@@ -167,12 +168,20 @@ impl Decoder {
fn decode_indexed(&self, buf: &mut Cursor<&Bytes>) -> Result<Entry, DecoderError> {
let index = try!(decode_int(buf, 7));
self.get_from_table(index)
self.table.get(index)
}
fn get_from_table(&self, index: usize) -> Result<Entry, DecoderError> {
fn decode_literal(&self, buf: &mut Cursor<&Bytes>, index: bool) -> Result<Entry, DecoderError> {
let prefix = if index {
6
} else {
4
};
// Extract the table index for the name, or 0 if not indexed
let table_idx = try!(decode_int(buf, prefix));
unimplemented!();
// self.header_table.get(index).o
}
}
@@ -280,21 +289,261 @@ impl Table {
self.max_size
}
/// Returns the entry located at the given index.
///
/// The table is 1-indexed and constructed in such a way that the first
/// entries belong to the static table, followed by entries in the dynamic
/// table. They are merged into a single index address space, though.
///
/// This is according to the [HPACK spec, section 2.3.3.]
/// (http://http2.github.io/http2-spec/compression.html#index.address.space)
pub fn get(&self, index: usize) -> Result<Entry, DecoderError> {
if index == 0 {
return Err(DecoderError::InvalidTableIndex);
}
if index <= 61 {
return Ok(get_static(index));
}
// Convert the index for lookup in the entries structure.
match self.entries.get(index - 62) {
Some(e) => Ok(e.clone()),
None => Err(DecoderError::InvalidTableIndex),
}
}
fn insert(&mut self, entry: Entry) {
let len = entry.len();
debug_assert!(len <= self.max_size);
while self.size + len > self.max_size {
let last = self.entries.pop_back()
.expect("size of table != 0, but no headers left!");
self.size -= last.len();
}
self.reserve(len);
self.size += len;
// Track the entry
self.entries.push_front(entry);
}
fn reserve(&mut self, size: usize) {
debug_assert!(size <= self.max_size);
while self.size + size > self.max_size {
let last = self.entries.pop_back()
.expect("size of table != 0, but no headers left!");
self.size -= last.len();
}
}
}
/// Get an entry from the static table
pub fn get_static(idx: usize) -> Entry {
use tower::http::StandardHeader::*;
match idx {
1 => Entry::Authority(Str::new()),
2 => Entry::Method(Method::Get),
3 => Entry::Method(Method::Post),
4 => Entry::Path(Str::from_static("/")),
5 => Entry::Path(Str::from_static("/index.html")),
6 => Entry::Scheme(Str::from_static("http")),
7 => Entry::Scheme(Str::from_static("https")),
8 => Entry::Status(StatusCode::Ok),
9 => Entry::Status(StatusCode::NoContent),
10 => Entry::Status(StatusCode::PartialContent),
11 => Entry::Status(StatusCode::NotModified),
12 => Entry::Status(StatusCode::BadRequest),
13 => Entry::Status(StatusCode::NotFound),
14 => Entry::Status(StatusCode::InternalServerError),
15 => Entry::Header {
name: AcceptCharset.into(),
value: Str::new(),
},
16 => Entry::Header {
name: AcceptEncoding.into(),
value: Str::from_static("gzip, deflate"),
},
17 => Entry::Header {
name: AcceptLanguage.into(),
value: Str::new(),
},
18 => Entry::Header {
name: AcceptRanges.into(),
value: Str::new(),
},
19 => Entry::Header {
name: Accept.into(),
value: Str::new(),
},
20 => Entry::Header {
name: AccessControlAllowOrigin.into(),
value: Str::new(),
},
21 => Entry::Header {
name: Age.into(),
value: Str::new(),
},
22 => Entry::Header {
name: Allow.into(),
value: Str::new(),
},
23 => Entry::Header {
name: Authorization.into(),
value: Str::new(),
},
24 => Entry::Header {
name: CacheControl.into(),
value: Str::new(),
},
25 => Entry::Header {
name: ContentDisposition.into(),
value: Str::new(),
},
26 => Entry::Header {
name: ContentEncoding.into(),
value: Str::new(),
},
27 => Entry::Header {
name: ContentLanguage.into(),
value: Str::new(),
},
28 => Entry::Header {
name: ContentLength.into(),
value: Str::new(),
},
29 => Entry::Header {
name: ContentLocation.into(),
value: Str::new(),
},
30 => Entry::Header {
name: ContentRange.into(),
value: Str::new(),
},
31 => Entry::Header {
name: ContentType.into(),
value: Str::new(),
},
32 => Entry::Header {
name: Cookie.into(),
value: Str::new(),
},
33 => Entry::Header {
name: Date.into(),
value: Str::new(),
},
34 => Entry::Header {
name: Etag.into(),
value: Str::new(),
},
35 => Entry::Header {
name: Expect.into(),
value: Str::new(),
},
36 => Entry::Header {
name: Expires.into(),
value: Str::new(),
},
37 => Entry::Header {
name: From.into(),
value: Str::new(),
},
38 => Entry::Header {
name: Host.into(),
value: Str::new(),
},
39 => Entry::Header {
name: IfMatch.into(),
value: Str::new(),
},
40 => Entry::Header {
name: IfModifiedSince.into(),
value: Str::new(),
},
41 => Entry::Header {
name: IfNoneMatch.into(),
value: Str::new(),
},
42 => Entry::Header {
name: IfRange.into(),
value: Str::new(),
},
43 => Entry::Header {
name: IfUnmodifiedSince.into(),
value: Str::new(),
},
44 => Entry::Header {
name: LastModified.into(),
value: Str::new(),
},
45 => Entry::Header {
name: Link.into(),
value: Str::new(),
},
46 => Entry::Header {
name: Location.into(),
value: Str::new(),
},
47 => Entry::Header {
name: MaxForwards.into(),
value: Str::new(),
},
48 => Entry::Header {
name: ProxyAuthenticate.into(),
value: Str::new(),
},
49 => Entry::Header {
name: ProxyAuthorization.into(),
value: Str::new(),
},
50 => Entry::Header {
name: Range.into(),
value: Str::new(),
},
51 => Entry::Header {
name: Referer.into(),
value: Str::new(),
},
52 => Entry::Header {
name: Refresh.into(),
value: Str::new(),
},
53 => Entry::Header {
name: RetryAfter.into(),
value: Str::new(),
},
54 => Entry::Header {
name: Server.into(),
value: Str::new(),
},
55 => Entry::Header {
name: SetCookie.into(),
value: Str::new(),
},
56 => Entry::Header {
name: StrictTransportSecurity.into(),
value: Str::new(),
},
57 => Entry::Header {
name: TransferEncoding.into(),
value: Str::new(),
},
58 => Entry::Header {
name: UserAgent.into(),
value: Str::new(),
},
59 => Entry::Header {
name: Vary.into(),
value: Str::new(),
},
60 => Entry::Header {
name: Via.into(),
value: Str::new(),
},
61 => Entry::Header {
name: WwwAuthenticate.into(),
value: Str::new(),
},
_ => unreachable!(),
}
}

View File

@@ -1,6 +1,7 @@
use tower::http::{HeaderName, Method, StatusCode, Str};
/// HPack table entry
#[derive(Debug, Clone)]
pub enum Entry {
Header {
name: HeaderName,

5
src/hpack/huffman.rs Normal file
View File

@@ -0,0 +1,5 @@
pub struct HuffmanState {
pub next: usize,
pub byte: u8,
pub flags: u8,
}

21254
src/hpack/huffman_table.rs Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,8 @@
mod encoder;
mod decoder;
mod entry;
mod huffman;
mod huffman_table;
// mod table;
pub use self::encoder::Encoder;

View File

@@ -3,216 +3,7 @@ use hpack::Entry;
use tower::http::{HeaderName, StatusCode, Method, Str};
use std::collections::VecDeque;
/// Get an entry from the static table
pub fn get_static(idx: usize) -> Entry {
use tower::http::StandardHeader::*;
match idx {
1 => Entry::Authority(Str::new()),
2 => Entry::Method(Method::Get),
3 => Entry::Method(Method::Post),
4 => Entry::Path(Str::from_static("/")),
5 => Entry::Path(Str::from_static("/index.html")),
6 => Entry::Scheme(Str::from_static("http")),
7 => Entry::Scheme(Str::from_static("https")),
8 => Entry::Status(StatusCode::Ok),
9 => Entry::Status(StatusCode::NoContent),
10 => Entry::Status(StatusCode::PartialContent),
11 => Entry::Status(StatusCode::NotModified),
12 => Entry::Status(StatusCode::BadRequest),
13 => Entry::Status(StatusCode::NotFound),
14 => Entry::Status(StatusCode::InternalServerError),
15 => Entry::Header {
name: AcceptCharset.into(),
value: Str::new(),
},
16 => Entry::Header {
name: AcceptEncoding.into(),
value: Str::from_static("gzip, deflate"),
},
17 => Entry::Header {
name: AcceptLanguage.into(),
value: Str::new(),
},
18 => Entry::Header {
name: AcceptRanges.into(),
value: Str::new(),
},
19 => Entry::Header {
name: Accept.into(),
value: Str::new(),
},
20 => Entry::Header {
name: AccessControlAllowOrigin.into(),
value: Str::new(),
},
21 => Entry::Header {
name: Age.into(),
value: Str::new(),
},
22 => Entry::Header {
name: Allow.into(),
value: Str::new(),
},
23 => Entry::Header {
name: Authorization.into(),
value: Str::new(),
},
24 => Entry::Header {
name: CacheControl.into(),
value: Str::new(),
},
25 => Entry::Header {
name: ContentDisposition.into(),
value: Str::new(),
},
26 => Entry::Header {
name: ContentEncoding.into(),
value: Str::new(),
},
27 => Entry::Header {
name: ContentLanguage.into(),
value: Str::new(),
},
28 => Entry::Header {
name: ContentLength.into(),
value: Str::new(),
},
29 => Entry::Header {
name: ContentLocation.into(),
value: Str::new(),
},
30 => Entry::Header {
name: ContentRange.into(),
value: Str::new(),
},
31 => Entry::Header {
name: ContentType.into(),
value: Str::new(),
},
32 => Entry::Header {
name: Cookie.into(),
value: Str::new(),
},
33 => Entry::Header {
name: Date.into(),
value: Str::new(),
},
34 => Entry::Header {
name: Etag.into(),
value: Str::new(),
},
35 => Entry::Header {
name: Expect.into(),
value: Str::new(),
},
36 => Entry::Header {
name: Expires.into(),
value: Str::new(),
},
37 => Entry::Header {
name: From.into(),
value: Str::new(),
},
38 => Entry::Header {
name: Host.into(),
value: Str::new(),
},
39 => Entry::Header {
name: IfMatch.into(),
value: Str::new(),
},
40 => Entry::Header {
name: IfModifiedSince.into(),
value: Str::new(),
},
41 => Entry::Header {
name: IfNoneMatch.into(),
value: Str::new(),
},
42 => Entry::Header {
name: IfRange.into(),
value: Str::new(),
},
43 => Entry::Header {
name: IfUnmodifiedSince.into(),
value: Str::new(),
},
44 => Entry::Header {
name: LastModified.into(),
value: Str::new(),
},
45 => Entry::Header {
name: Link.into(),
value: Str::new(),
},
46 => Entry::Header {
name: Location.into(),
value: Str::new(),
},
47 => Entry::Header {
name: MaxForwards.into(),
value: Str::new(),
},
48 => Entry::Header {
name: ProxyAuthenticate.into(),
value: Str::new(),
},
49 => Entry::Header {
name: ProxyAuthorization.into(),
value: Str::new(),
},
50 => Entry::Header {
name: Range.into(),
value: Str::new(),
},
51 => Entry::Header {
name: Referer.into(),
value: Str::new(),
},
52 => Entry::Header {
name: Refresh.into(),
value: Str::new(),
},
53 => Entry::Header {
name: RetryAfter.into(),
value: Str::new(),
},
54 => Entry::Header {
name: Server.into(),
value: Str::new(),
},
55 => Entry::Header {
name: SetCookie.into(),
value: Str::new(),
},
56 => Entry::Header {
name: StrictTransportSecurity.into(),
value: Str::new(),
},
57 => Entry::Header {
name: TransferEncoding.into(),
value: Str::new(),
},
58 => Entry::Header {
name: UserAgent.into(),
value: Str::new(),
},
59 => Entry::Header {
name: Vary.into(),
value: Str::new(),
},
60 => Entry::Header {
name: Via.into(),
value: Str::new(),
},
61 => Entry::Header {
name: WwwAuthenticate.into(),
value: Str::new(),
},
_ => unreachable!(),
}
}
/*
pub struct Table {