Skip to content

Commit 4938df5

Browse files
author
adamdunkels
committed
Update to Contiki version number 2.4
1 parent 388c5d4 commit 4938df5

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
lines changed

‎apps/webbrowser/http-strings

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ http_crnl "\r\n"
1313
http_index_html "/index.html"
1414
http_404_html "/404.html"
1515
http_referer "Referer:"
16-
http_header_200 "HTTP/1.0 200 OK\r\nServer: Contiki/2.2.2 http://www.sics.se/contiki/\r\nConnection: close\r\n"
17-
http_header_404 "HTTP/1.0 404 Not found\r\nServer: Contiki/2.2.2 http://www.sics.se/contiki/\r\nConnection: close\r\n"
16+
http_header_200 "HTTP/1.0 200 OK\r\nServer: Contiki/2.4 http://www.sics.se/contiki/\r\nConnection: close\r\n"
17+
http_header_404 "HTTP/1.0 404 Not found\r\nServer: Contiki/2.4 http://www.sics.se/contiki/\r\nConnection: close\r\n"
1818
http_content_type_plain "Content-type: text/plain\r\n\r\n"
1919
http_content_type_html "Content-type: text/html\r\n\r\n"
2020
http_content_type_css "Content-type: text/css\r\n\r\n"

‎apps/webbrowser/http-strings.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ const char http_404_html[10] =
4343
const char http_referer[9] =
4444
/* "Referer:" */
4545
{0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x72, 0x3a, };
46-
const char http_header_200[88] =
47-
/* "HTTP/1.0 200 OK\r\nServer: Contiki/2.2.2 http://www.sics.se/contiki/\r\nConnection: close\r\n" */
48-
{0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x30, 0x20, 0x32, 0x30, 0x30, 0x20, 0x4f, 0x4b, 0xd, 0xa, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3a, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0x32, 0x2e, 0x32, 0x2e, 0x32, 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x73, 0x69, 0x63, 0x73, 0x2e, 0x73, 0x65, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0xd, 0xa, };
49-
const char http_header_404[95] =
50-
/* "HTTP/1.0 404 Not found\r\nServer: Contiki/2.2.2 http://www.sics.se/contiki/\r\nConnection: close\r\n" */
51-
{0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x30, 0x20, 0x34, 0x30, 0x34, 0x20, 0x4e, 0x6f, 0x74, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0xd, 0xa, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3a, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0x32, 0x2e, 0x32, 0x2e, 0x32, 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x73, 0x69, 0x63, 0x73, 0x2e, 0x73, 0x65, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0xd, 0xa, };
46+
const char http_header_200[86] =
47+
/* "HTTP/1.0 200 OK\r\nServer: Contiki/2.4 http://www.sics.se/contiki/\r\nConnection: close\r\n" */
48+
{0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x30, 0x20, 0x32, 0x30, 0x30, 0x20, 0x4f, 0x4b, 0xd, 0xa, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3a, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0x32, 0x2e, 0x34, 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x73, 0x69, 0x63, 0x73, 0x2e, 0x73, 0x65, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0xd, 0xa, };
49+
const char http_header_404[93] =
50+
/* "HTTP/1.0 404 Not found\r\nServer: Contiki/2.4 http://www.sics.se/contiki/\r\nConnection: close\r\n" */
51+
{0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x30, 0x20, 0x34, 0x30, 0x34, 0x20, 0x4e, 0x6f, 0x74, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0xd, 0xa, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3a, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0x32, 0x2e, 0x34, 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x73, 0x69, 0x63, 0x73, 0x2e, 0x73, 0x65, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0xd, 0xa, };
5252
const char http_content_type_plain[29] =
5353
/* "Content-type: text/plain\r\n\r\n" */
5454
{0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x3a, 0x20, 0x74, 0x65, 0x78, 0x74, 0x2f, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0xd, 0xa, 0xd, 0xa, };

‎apps/webbrowser/http-strings.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ extern const char http_crnl[3];
1313
extern const char http_index_html[12];
1414
extern const char http_404_html[10];
1515
extern const char http_referer[9];
16-
extern const char http_header_200[88];
17-
extern const char http_header_404[95];
16+
extern const char http_header_200[86];
17+
extern const char http_header_404[93];
1818
extern const char http_content_type_plain[29];
1919
extern const char http_content_type_html[28];
2020
extern const char http_content_type_css [27];

‎apps/webserver/http-strings

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ http_crnl "\r\n"
1313
http_index_html "/index.html"
1414
http_404_html "/404.html"
1515
http_referer "Referer:"
16-
http_header_200 "HTTP/1.0 200 OK\r\nServer: Contiki/2.2.2 http://www.sics.se/contiki/\r\nConnection: close\r\n"
17-
http_header_404 "HTTP/1.0 404 Not found\r\nServer: Contiki/2.2.2 http://www.sics.se/contiki/\r\nConnection: close\r\n"
16+
http_header_200 "HTTP/1.0 200 OK\r\nServer: Contiki/2.4 http://www.sics.se/contiki/\r\nConnection: close\r\n"
17+
http_header_404 "HTTP/1.0 404 Not found\r\nServer: Contiki/2.4 http://www.sics.se/contiki/\r\nConnection: close\r\n"
1818
http_content_type_plain "Content-type: text/plain\r\n\r\n"
1919
http_content_type_html "Content-type: text/html\r\n\r\n"
2020
http_content_type_css "Content-type: text/css\r\n\r\n"

‎apps/webserver/http-strings.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ const char http_404_html[10] =
4343
const char http_referer[9] =
4444
/* "Referer:" */
4545
{0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x72, 0x3a, };
46-
const char http_header_200[88] =
47-
/* "HTTP/1.0 200 OK\r\nServer: Contiki/2.2.2 http://www.sics.se/contiki/\r\nConnection: close\r\n" */
48-
{0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x30, 0x20, 0x32, 0x30, 0x30, 0x20, 0x4f, 0x4b, 0xd, 0xa, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3a, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0x32, 0x2e, 0x32, 0x2e, 0x32, 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x73, 0x69, 0x63, 0x73, 0x2e, 0x73, 0x65, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0xd, 0xa, };
49-
const char http_header_404[95] =
50-
/* "HTTP/1.0 404 Not found\r\nServer: Contiki/2.2.2 http://www.sics.se/contiki/\r\nConnection: close\r\n" */
51-
{0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x30, 0x20, 0x34, 0x30, 0x34, 0x20, 0x4e, 0x6f, 0x74, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0xd, 0xa, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3a, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0x32, 0x2e, 0x32, 0x2e, 0x32, 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x73, 0x69, 0x63, 0x73, 0x2e, 0x73, 0x65, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0xd, 0xa, };
46+
const char http_header_200[86] =
47+
/* "HTTP/1.0 200 OK\r\nServer: Contiki/2.4 http://www.sics.se/contiki/\r\nConnection: close\r\n" */
48+
{0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x30, 0x20, 0x32, 0x30, 0x30, 0x20, 0x4f, 0x4b, 0xd, 0xa, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3a, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0x32, 0x2e, 0x34, 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x73, 0x69, 0x63, 0x73, 0x2e, 0x73, 0x65, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0xd, 0xa, };
49+
const char http_header_404[93] =
50+
/* "HTTP/1.0 404 Not found\r\nServer: Contiki/2.4 http://www.sics.se/contiki/\r\nConnection: close\r\n" */
51+
{0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x30, 0x20, 0x34, 0x30, 0x34, 0x20, 0x4e, 0x6f, 0x74, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0xd, 0xa, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3a, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0x32, 0x2e, 0x34, 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x73, 0x69, 0x63, 0x73, 0x2e, 0x73, 0x65, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0xd, 0xa, };
5252
const char http_content_type_plain[29] =
5353
/* "Content-type: text/plain\r\n\r\n" */
5454
{0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x3a, 0x20, 0x74, 0x65, 0x78, 0x74, 0x2f, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0xd, 0xa, 0xd, 0xa, };

‎apps/webserver/http-strings.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ extern const char http_crnl[3];
1313
extern const char http_index_html[12];
1414
extern const char http_404_html[10];
1515
extern const char http_referer[9];
16-
extern const char http_header_200[88];
17-
extern const char http_header_404[95];
16+
extern const char http_header_200[86];
17+
extern const char http_header_404[93];
1818
extern const char http_content_type_plain[29];
1919
extern const char http_content_type_html[28];
2020
extern const char http_content_type_css [27];

‎core/contiki-version.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
*
3131
* Author: Adam Dunkels <[email protected]>
3232
*
33-
* $Id: contiki-version.h,v 1.8 2009/06/22 20:40:43 adamdunkels Exp $
33+
* $Id: contiki-version.h,v 1.9 2010/01/29 18:04:54 adamdunkels Exp $
3434
*/
3535
#ifndef __CONTIKI_VERSION__
3636
#define __CONTIKI_VERSION__
3737

3838
#ifndef CONTIKI_VERSION_STRING
39-
#define CONTIKI_VERSION_STRING "Contiki 2.3"
39+
#define CONTIKI_VERSION_STRING "Contiki 2.4"
4040
#endif /* CONTIKI_VERSION_STRING */
4141

4242
#endif /* __CONTIKI_VERSION__ */

‎doc/Doxyfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#---------------------------------------------------------------------------
44
# Project related configuration options
55
#---------------------------------------------------------------------------
6-
PROJECT_NAME = "Contiki 2.3"
6+
PROJECT_NAME = "Contiki 2.4"
77
PROJECT_NUMBER =
88
OUTPUT_DIRECTORY = .
99
CREATE_SUBDIRS = NO

0 commit comments

Comments
 (0)