summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <>2006-12-08 19:20:51 +0000
committererdgeist <>2006-12-08 19:20:51 +0000
commit2adf4fb28af99dd72c6b2fc816bcc11e5dde1ffc (patch)
tree76b4283abe57c76b0efc7c48355f787ee6781b7b
parent88679832f066d35d3b1fadba0ef13bf42a54cd15 (diff)
Our scanner routine for the URI query string
-rw-r--r--scan_urlencoded_query.c57
-rw-r--r--scan_urlencoded_query.h20
-rw-r--r--trackerlogic.c4
3 files changed, 79 insertions, 2 deletions
diff --git a/scan_urlencoded_query.c b/scan_urlencoded_query.c
new file mode 100644
index 0000000..7aeabab
--- /dev/null
+++ b/scan_urlencoded_query.c
@@ -0,0 +1,57 @@
1#include "scan.h"
2
3#define BREAK_AT_QUESTIONMARK (1<<0)
4#define BREAK_AT_WHITESPACE (1<<1)
5#define BREAK_AT_AMPERSAND (1<<2)
6#define BREAK_AT_EQUALSIGN (1<<3)
7
8#define SCAN_PATH ( BREAK_AT_QUESTIONMARK | BREAK_AT_WHITESPACE )
9#define SCAN_SEARCHPATH_PARAM ( BREAK_AT_EQUALSIGN )
10#define SCAN_SEARCHPATH_VALUE ( BREAK_AT_AMPERSAND | BREAK_AT_WHITESPACE )
11
12// Idea is to do a in place replacement or guarantee at least
13// strlen( string ) bytes in deststring
14// watch http://www.ietf.org/rfc/rfc2396.txt
15// unreserved = alphanum | mark
16// mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"
17// we add '%' to the matrix to not stop at encoded chars.
18
19static const unsigned char reserved_matrix[] = { 0xA2, 0x63, 0xFF, 0x03, 0xFE, 0xFF, 0xFF, 0x87, 0xFE, 0xFF, 0xFF, 0x47};
20inline int is_unreserved( unsigned char c ) const {
21 if( ( c <= 32 ) || ( c >= 127 ) ) return 0; return 1&(reserved_matrix[(c-32)>>3]>>(c&7));
22}
23
24size_t scan_urlencoded_query(char **string, char *deststring, int flags) {
25 register const unsigned char* s=*(const unsigned char*) string;
26 const unsigned char *d = deststring;
27 register unsigned char b, c;
28
29 while ( is_unreserved( c = *s++) ) {
30 if (c=='%') {
31 if( ( c = scan_fromhex(*s++) ) < 0 ) return -1;
32 if( ( b = scan_fromhex(*s++) ) < 0 ) return -1;
33 c=(c<<4)|b;
34 }
35 *d++ = c;
36 }
37
38 switch( c ) {
39 case 0: case '\r': case '\n': case ' ':
40 if ( flags & BREAK_AT_WHITESPACE == 0 ) return -1;
41 break;
42 case '?':
43 if ( flags & BREAK_AT_QUESTIONMARK == 0 ) return -1;
44 break;
45 case '=':
46 if ( flags & BREAK_AT_EQUALSIGN == 0 ) return -1;
47 break;
48 case '&':
49 if ( flags & BREAK_AT_AMPERSAND == 0 ) return -1;
50 break;
51 default:
52 return -1;
53 }
54
55 *string = s;
56 return d - deststring;
57}
diff --git a/scan_urlencoded_query.h b/scan_urlencoded_query.h
new file mode 100644
index 0000000..379bc32
--- /dev/null
+++ b/scan_urlencoded_query.h
@@ -0,0 +1,20 @@
1#ifdef __SCAN_URLENCODED_QUERY_H__
2#define __SCAN_URLENCODED_QUERY_H__
3
4#define BREAK_AT_QUESTIONMARK (1<<0)
5#define BREAK_AT_WHITESPACE (1<<1)
6#define BREAK_AT_AMPERSAND (1<<2)
7#define BREAK_AT_EQUALSIGN (1<<3)
8
9#define SCAN_PATH ( BREAK_AT_QUESTIONMARK | BREAK_AT_WHITESPACE )
10#define SCAN_SEARCHPATH_PARAM ( BREAK_AT_EQUALSIGN )
11#define SCAN_SEARCHPATH_VALUE ( BREAK_AT_AMPERSAND | BREAK_AT_WHITESPACE )
12
13// string pointer to source, pointer to after terminator on return
14// deststring pointer to destination
15// flags determines, what to parse
16// returns number of valid converted characters in deststring
17// or -1 for parse error
18size_t scan_urlencoded_query(char **string, char *deststring, int flags);
19
20#endif
diff --git a/trackerlogic.c b/trackerlogic.c
index 735041e..6274c41 100644
--- a/trackerlogic.c
+++ b/trackerlogic.c
@@ -162,7 +162,7 @@ void return_peers_for_torrent( ot_torrent torrent, unsigned long amount, char *r
162 162
163// Compacts a torrents peer list 163// Compacts a torrents peer list
164// * torrents older than OT_TIMEOUT are being kicked 164// * torrents older than OT_TIMEOUT are being kicked
165// * is rather expansive 165// * is rather expensive
166// * if this fails, torrent file is invalid, should add flag 166// * if this fails, torrent file is invalid, should add flag
167// 167//
168void heal_torrent( ot_torrent torrent ) { 168void heal_torrent( ot_torrent torrent ) {
@@ -269,7 +269,7 @@ int init_logic( char *directory ) {
269 269
270 // Scan directory for filenames in the form [0-9A-F]{20} 270 // Scan directory for filenames in the form [0-9A-F]{20}
271 // * I know this looks ugly, but I've seen A-F to match umlauts as well in strange locales 271 // * I know this looks ugly, but I've seen A-F to match umlauts as well in strange locales
272 // * lower case for .. better being safe than sorry, this is not expansive here :) 272 // * lower case for .. better being safe than sorry, this is not expensive here :)
273 if( !glob( 273 if( !glob(
274 "[0-9ABCDEFabcdef][0-9ABCDEFabcdef][0-9ABCDEFabcdef][0-9ABCDEFabcdef]" 274 "[0-9ABCDEFabcdef][0-9ABCDEFabcdef][0-9ABCDEFabcdef][0-9ABCDEFabcdef]"
275 "[0-9ABCDEFabcdef][0-9ABCDEFabcdef][0-9ABCDEFabcdef][0-9ABCDEFabcdef]" 275 "[0-9ABCDEFabcdef][0-9ABCDEFabcdef][0-9ABCDEFabcdef][0-9ABCDEFabcdef]"