Skip to content

Update WebServer.h #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
unwiredben merged 1 commit into from
Feb 4, 2014
Merged

Update WebServer.h #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 47 additions & 3 deletions WebServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-file-style: "k&r"; c-basic-offset: 2; -*-

Webduino, a simple Arduino web server
Copyright 2009-2012 Ben Combee, Ran Talbott, Christopher Lee, Martin Lormes
Copyright 2009-2014 Ben Combee, Ran Talbott, Christopher Lee, Martin Lormes
Francisco M Cuenca-Acuna

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -28,6 +29,7 @@
#include <string.h>
#include <stdlib.h>

#include <Ethernet.h>
#include <EthernetClient.h>
#include <EthernetServer.h>

Expand Down Expand Up @@ -221,6 +223,12 @@ class WebServer: public Print
// inline overload for printP to handle signed char strings
void printP(const char *str) { printP((unsigned char*)str); }

// support for C style formating
void printf(char *fmt, ... );
#ifdef F
void printf(const __FlashStringHelper *format, ... );
#endif

// output raw data stored in program memory
void writeP(const unsigned char *data, size_t length);

Expand Down Expand Up @@ -299,10 +307,16 @@ class WebServer: public Print

// implementation of write used to implement Print interface
virtual size_t write(uint8_t);
virtual size_t write(const uint8_t *buffer, size_t size);

// tells if there is anything to process
uint8_t available();

// Flush the send buffer
void flushBuf();

// Close the current connection and flush ethernet buffers
void reset();
private:
EthernetServer m_server;
EthernetClient m_client;
Expand All @@ -328,7 +342,6 @@ class WebServer: public Print
uint8_t m_buffer[WEBDUINO_OUTPUT_BUFFER_SIZE];
uint8_t m_bufFill;

void reset();
void getRequest(WebServer::ConnectionType &type, char *request, int *length);
bool dispatchCommand(ConnectionType requestType, char *verb,
bool tail_complete);
Expand All @@ -341,7 +354,6 @@ class WebServer: public Print
char *url_tail, bool tail_complete);
void noRobots(ConnectionType type);
void favicon(ConnectionType type);
void flushBuf();
};

/* define this macro if you want to include the header in a sketch source
Expand Down Expand Up @@ -409,6 +421,12 @@ size_t WebServer::write(uint8_t ch)
return sizeof(ch);
}

size_t WebServer::write(const uint8_t *buffer, size_t size)
{
flushBuf(); //Flush any buffered output
return m_client.write(buffer, size);
}

void WebServer::flushBuf()
{
if(m_bufFill > 0)
Expand Down Expand Up @@ -443,6 +461,32 @@ void WebServer::printCRLF()
print(CRLF);
}

void WebServer::printf(char *fmt, ... )
{
char tmp[128]; // resulting string limited to 128 chars
va_list args;
va_start (args, fmt );
vsnprintf(tmp, 128, fmt, args);
va_end (args);
print(tmp);
}

#ifdef F
void WebServer::printf(const __FlashStringHelper *format, ... )
{
char buf[128]; // resulting string limited to 128 chars
va_list ap;
va_start(ap, format);
#ifdef __AVR__
vsnprintf_P(buf, sizeof(buf), (const char *)format, ap); // progmem for AVR
#else
vsnprintf(buf, sizeof(buf), (const char *)format, ap); // for the rest of the world
#endif
va_end(ap);
print(buf);
}
#endif

bool WebServer::dispatchCommand(ConnectionType requestType, char *verb,
bool tail_complete)
{
Expand Down