sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in masayuki2009/nuttx.apps/add_webserver_info (pull request #182)

Browse Source 
netutils/webserver: Add web server info based on uname()

Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Masayuki Ishikawa 2019-07-05 11:42:54 +00:00 committed by Gregory Nutt
parent 39ad02f72e
commit 2bb4834775
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
netutils/webserver/httpd_dirlist.c
View File

@ -41,6 +41,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/utsname.h>
#include <limits.h> #include <limits.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
@ -59,6 +60,20 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_ARCH_BOARD_CUSTOM
# ifndef CONFIG_ARCH_BOARD_CUSTOM_NAME
# define BOARD_NAME g_unknown
# else
# define BOARD_NAME CONFIG_ARCH_BOARD_CUSTOM_NAME
# endif
#else
# ifndef CONFIG_ARCH_BOARD
# define BOARD_NAME g_unknown
# else
# define BOARD_NAME CONFIG_ARCH_BOARD
# endif
#endif
#define BUF_SIZE 1024 #define BUF_SIZE 1024
#define HEADER \ #define HEADER \
@ -91,6 +106,7 @@
#define FOOTER \ #define FOOTER \
" <tr><th colspan=\"4\"><hr></th></tr>\n" \ " <tr><th colspan=\"4\"><hr></th></tr>\n" \
"</table>\n" \ "</table>\n" \
"<address>uIP web server (%s %s %s %s %s) </address>\n" \
"</body>\n" \ "</body>\n" \
"</html>\n" "</html>\n"
@ -101,6 +117,7 @@
ssize_t httpd_dirlist(int outfd, FAR struct httpd_fs_file *file) ssize_t httpd_dirlist(int outfd, FAR struct httpd_fs_file *file)
{ {
struct dirent *dent; struct dirent *dent;
struct utsname info;
struct stat buf; struct stat buf;
struct tm tm; struct tm tm;
ssize_t total; ssize_t total;
@ -209,7 +226,17 @@ ssize_t httpd_dirlist(int outfd, FAR struct httpd_fs_file *file)
errout_with_hdr: errout_with_hdr:
ret = write(outfd, FOOTER, sizeof(FOOTER)); memset(&info, 0, sizeof(info));
uname(&info);
snprintf(tmp, BUF_SIZE, FOOTER,
info.sysname,
info.release,
info.version,
info.machine,
BOARD_NAME);
ret = write(outfd, tmp, strlen(tmp));
if (-1 != ret) if (-1 != ret)
{ {