Commit Graph

385 Commits

Author SHA1 Message Date
Gregory Nutt
f10f2de2e4 Eliminate some warnings 2015-09-08 09:20:49 -06:00
Gregory Nutt
6b1d61c759 More references to avsprintf that need to be changed vasprintf 2015-09-07 17:09:11 -06:00
Alan Carvalho de Assis
e7ba97e2b5 Fix pap authentication, pap_username and pap_password were moved to struct settings 2015-09-07 13:34:01 -06:00
Gregory Nutt
ae0d87c0cb PPPD: Fix a few coding style problems 2015-09-01 17:28:17 -06:00
Gregory Nutt
74801cf38e apps/tools/mkkconfig.sh: The top-level Kconfig file is not auto-generated. The autogenerated Kconfig file will be constructed so that every second level directory that contains a Kconfig file will automatically be sourced 2015-08-11 17:49:10 -06:00
Anton D. Kachalov
b43c5a6b1e THTTPD: Depends on !DISABLE_POLL
webserver:  Allow to build webserver as an application

Signed-off-by: Anton D. Kachalov mouse@yandex-team.ru
2015-08-10 14:44:11 -06:00
Librae
46b257c945 netutils: fix a typo while validating addrlen 2015-07-24 02:26:54 +08:00
Gregory Nutt
7e43ffa602 Fix a bad function prototype introduced in a previous commit 2015-07-12 13:42:28 -06:00
Gregory Nutt
ba72767d09 apps/netutils/netlib and other files: Create netlib wrapper functions around dns_getserver() and dns_setserver() to isolate application code from changes to those interfaces. 2015-07-12 11:53:23 -06:00
Gregory Nutt
812450ebe6 If NSH or Webclient is selected, make sure that CONFIG_LIBC_NETDB is enabled; reanem dnsclient.h to dns.h 2015-07-12 09:25:39 -06:00
Gregory Nutt
c7bd1f4186 Replaces calls to non-standard dns_hostip() with calls to the standard gethostbyname() 2015-07-11 08:15:29 -06:00
Gregory Nutt
ae57fd7ee2 Fix some warnings/errors detected by nuttx/tools/testbuilds.sh 2015-07-10 18:41:56 -06:00
Gregory Nutt
5e8928d009 Remove bogus references to CONFIG_HAVE_GETHOSTBYNAME 2015-07-10 14:03:28 -06:00
Gregory Nutt
48c36800f5 apps/netuils/dnsclient and include/netutils/dnsclient.h: Move the DNS client logic into the NuttX C library. It is a necessary part for the full implementation of the netdb logic and provides more flexibility in that location. 2015-07-10 11:31:13 -06:00
Gregory Nutt
d5b6949c9f Fix references to the no-longer-existent misc/ directory in comments, README files, and documentation 2015-06-28 08:14:53 -06:00
Gregory Nutt
cee35e124b apps/netutils/thttpd: Missing gci-src as a dependency path when building with BINFS enabled 2015-06-18 18:18:53 -06:00
Gregory Nutt
2ba737b5e5 Clean up and review of header files for conformance to standards 2015-06-12 19:26:01 -06:00
Gregory Nutt
3b5adf79dc Add asctime(), asctime_r(), ctime(), and ctime_r(). 2015-06-12 11:52:49 -06:00
Gregory Nutt
f5f5a3766a THTTPD: Remove use of lstat when directory indexing is enabled. NuttX does not support symbolic links 2015-06-12 10:07:28 -06:00
Gregory Nutt
a3eb9bb43a Fix a few errors/warnings in THTTPD when indexing is enabled. Still depends on non-existent lstat and ctime 2015-06-12 09:57:12 -06:00
Gregory Nutt
3e692f3912 apps/examples/thttpd now uses the Union File System if BINFS is selected for CGI binaris 2015-06-06 19:16:14 -06:00
Gregory Nutt
980f5a3675 apps/examples/thttpd: Need to use a different Front Page is CONFIG_THTTPD_BINFS=y 2015-06-02 15:19:17 -06:00
Gregory Nutt
bd8459d839 Fix a default value in the THTTPD Kconfig; updated a README file 2015-06-02 14:59:13 -06:00
Gregory Nutt
91ab8b0bc5 Extend apps/examples/thttpd so that it provides a index.cgi file the binfs file system is selected. 2015-06-02 14:26:08 -06:00
Gregory Nutt
b3780a071c Damn. THTTPD will not yet run with binfs because it wants an index.html file. THTTPD does support indexing directories if CONFIG_THTTPD_GENERATE_INDICES=y, but there are some compilation issues that need to be fixed when that option is selected. 2015-06-02 12:13:18 -06:00
Gregory Nutt
15fcf746be THTTPD w/binfs: A few fixes 2015-06-02 11:55:45 -06:00
Gregory Nutt
1e91c05d03 THTTPD: Add support for using binfs/ instead of NXFLAT. NXFLAT is probably the better solution but recently compiler changes make it unusable. binfs or ELF are fallback binary formats. This commit adds an option to use binfs. 2015-06-02 10:45:48 -06:00
Gregory Nutt
862d452d9b Fix numerous typos in configuration variable names. Tracked down by Alan Carvalho de Assis 2015-05-23 17:08:35 -06:00
Gregory Nutt
b641bee873 Minor fixes to apps/netutils/Kconfig and nuttx/libc/net/lib_inetntoa.c from Max Neklyudov 2015-05-19 12:07:07 -06:00
Gregory Nutt
a79f3840a8 apps/netutils/ntp: Fix mismatched sched_lock/unlock. Noted by Juha Niskanen 2015-05-06 07:54:22 -06:00
Gregory Nutt
af29ca3819 apps/netutils: Separated out apps/examples/pppd; split up pppd utils. From Brennan Ashton 2015-04-14 07:02:12 -06:00
Gregory Nutt
134472af0e apps/netutils/ppp: Make pppd PAP authentication optional. From Brennan Ashton 2015-04-14 06:45:17 -06:00
Gregory Nutt
3ac47d64ab Remove more NTP client references from pppd. From Brennan Ashton. 2015-04-13 14:00:45 -06:00
Gregory Nutt
476e3a8080 Remove ntpclient file in pppd dir. From Brennan Ashton. 2015-04-13 13:56:37 -06:00
Gregory Nutt
50deb7ad20 Remove executable flag from more .c and .h files 2015-04-09 08:20:57 -06:00
Gregory Nutt
5ca324cad8 Add some missing dependencies in Kconfig files 2015-03-29 15:52:46 -06:00
Gregory Nutt
b7768bea79 Bringing PPPD yet closer to the NuttX coding style 2015-03-11 18:47:04 -06:00
Gregory Nutt
f87fd5118c Add file headers to all PPPD files (still lots of style incompatibilies) 2015-03-11 08:33:57 -06:00
Gregory Nutt
e5a4835f5e Add a PPP daemon. From Max Neklyudov 2015-03-11 07:53:04 -06:00
Gregory Nutt
0ff0aa6d21 Add some Kconfig dependencies to reduce possibility of bad configurations. Suggested by OrbitalFox 2015-02-25 08:43:25 -06:00
Gregory Nutt
8d7952d55a Fix typo in Telnet Kconfig. From OrbitalFox 2015-02-19 06:40:18 -06:00
Gregory Nutt
fe20f19afe Some files that now include sys/time.h should no longer include timer.h 2015-02-15 16:38:18 -06:00
Gregory Nutt
23dfce6275 Suffer the consequences of moving struct timeval to its correct location 2015-02-15 15:18:35 -06:00
Gregory Nutt
d32e66b6a2 apps/netutils/netlib: Add utilities to convert to/from prefix lengths from/to 128-bit network masks. Modify the NSH IPv6 ifconfig command to show the network mask in a more standard, human readable way. 2015-02-06 10:23:15 -06:00
Gregory Nutt
0ee67383d5 Add an ioctal() that can be used to perform ICMPv6 auto-configuration 2015-02-03 08:54:42 -06:00
Gregory Nutt
5499189417 Add netlib and application hooks for ICMPv6 auto-configuration (still incomplete 2015-02-03 08:01:55 -06:00
Gregory Nutt
746f3919cd Networking: Correct the value returned by accept() in the case where net_lockingwait() is called. It was returning -1 and losing the errno value. Noted by Rony Xln 2015-01-22 06:51:31 -06:00
Gregory Nutt
680ee615fa apps/netutils/telnetd: Add protection when CONFIG_SCHED_HAVE_PARENT is enabled: Call sigaction with SA_NOCLDWAIT so that exit status is not retained (no zombies) and block receipt of SIGCHLD so that accept is not awakened by a signal. Iff accept() is awakened by a signal, do not do anything crazy like exit. Most from Rony Xln 2015-01-22 06:33:55 -06:00
Gregory Nutt
c96aa9218a Correct name of fields in struct sockaddr_in6: sin6_port and sin6_family, not sin_port and sin_family 2015-01-20 18:14:09 -06:00
Gregory Nutt
2668e34f5a apps/netutils/netlib: All IOCTLs must use a valid address family -- even if the address family does not matter such as when getting the MAC address or the network flags 2015-01-19 11:41:46 -06:00
Gregory Nutt
f0b4b9cc45 Networking: Fix some problems with debug is enabled; fix a warning 2015-01-19 10:16:37 -06:00
Gregory Nutt
5741e70eb9 apps/netutils/netlib: Add new library functions to manipulate IPv6 addresses 2015-01-18 15:56:14 -06:00
Gregory Nutt
953c0fb069 Rename IPv4 netlib functions and files to make room in the namespace for corresponding IPv6 functions and files 2015-01-18 14:17:00 -06:00
Gregory Nutt
bf3c7bd286 apps/netutils/dnsclient: Can select to be either IPv4 or IPv6, but not both (IPv6 still does not compile) 2015-01-18 10:51:53 -06:00
Gregory Nutt
7720c35502 Networking: Replace all references to the macros net_ipaddr_copy, net_ipaddr_hdrcopy, net_ipaddr_cmp, net_ipaddr_hdrcmp, and net_ipaddr_maskcmp with the appropriate IPv4 or IPv6 version of the macro (such as net_ipv4addr_copy). The goal is to support both IPv4 and IPv6 simultaneously. This requires that the macros be distinct and not conditionally defined to one on or the other. 2015-01-16 13:01:08 -06:00
Gregory Nutt
36118a1b76 Networking: Replace all references to net_ipaddr_t with either in_addr_t on net_ipv6addr_t. The goal is to support both IPv4 and IPv6 simultaneously. This requires that the two types be distinct and not conditionally typedef'ed to net_ipaddr_t. 2015-01-16 12:30:18 -06:00
Gregory Nutt
63566455d8 Telnetd: EBUSY is not an error in this case, then why report an error? 2015-01-03 09:53:35 -06:00
Gregory Nutt
308818b718 NSH TFTP get command: Wrong file name used for the destination. From Lazlo 2014-12-10 18:37:43 -06:00
Gregory Nutt
55bfbed33f Fixes for more issues found by cppcheck 2014-11-25 15:26:30 -06:00
Gregory Nutt
b8e4d7c500 Fixing md5 hashing when digest[$i] lower that 16. Sergey <sectus@mail.ru> 2014-11-20 07:10:47 -06:00
Gregory Nutt
af6272a227 SAMA5D4-EK EMAC1: Correct name of EMAC1 configuration variable 2014-11-18 11:02:22 -06:00
Gregory Nutt
24aa151b00 Ooops.. Fix oversight in last commit 2014-11-18 07:43:34 -06:00
Gregory Nutt
424c885f55 DHCPD: Remove dhcpd_addoption_n. It uses C features not supported by all compilers 2014-11-18 07:25:01 -06:00
Gregory Nutt
e59819bbed DHCPD: Add support for the dhcp options for netmask, router and dns. From Brennan Ashton 2014-11-18 07:20:18 -06:00
Gregory Nutt
64b8c1841c Clarify MTU/BUFSIZE in apps/ README.txt files and Documentation 2014-11-16 08:50:36 -06:00
Gregory Nutt
f9074a02ad Network: Various fixes for clean compile with both Ethernet and SLIP 2014-11-15 13:52:39 -06:00
Gregory Nutt
34bb359447 Network: All logic will now handle varialbe length link layer protocol headers within incoming packets. This permits use of multiple network interfaces with differing data links. For example, ETHERNET + SLIP 2014-11-15 13:13:23 -06:00
Gregory Nutt
60689e2513 Right now if you make a dns request before the dns address it set you will get an assertion. The state of the IP setting is not something the application should be aware of, it should only be concerned with whether or not the name was resolved. From Brennan Ashton. 2014-11-13 14:07:46 -06:00
Gregory Nutt
cca428102d Trivial typo 2014-10-18 09:47:17 -06:00
Gregory Nutt
b5cb66927d Fix memcpy of host address in netlib_gethostaddr(). From Brennan Ashton 2014-10-17 16:53:15 -06:00
Gregory Nutt
8c24662011 Misc changes to get a clean build after all of the syslog changes. There are probably other things still broken 2014-10-08 16:23:48 -06:00
Gregory Nutt
ff8338b5c2 Add implementation of timeouts for the apps/netutils/webclient. From Brennan Ashton 2014-09-29 17:10:49 -06:00
Gregory Nutt
0a4258db6d MAINOBJ needs to be added to object list in many Makefile 2014-09-11 06:48:11 -06:00
Gregory Nutt
ab5cf06c48 Changes to many Makefiles. For kernel buil object containing main cannot go into library because of name collisions. The object file must be handled as a special case in every Makefile 2014-09-07 08:51:51 -06:00
Gregory Nutt
043d6898db Determine the main object name from the main source name in every kernel build Makefile 2014-09-07 07:19:19 -06:00
Gregory Nutt
2881b73f3d Add an nm command after every kernel build link to show if there are any undefined symbols 2014-09-07 07:15:59 -06:00
Gregory Nutt
70765b94fc Add the main object to the list objects to link in every kernel build link command 2014-09-07 07:12:55 -06:00
Gregory Nutt
22720d5eb3 Add the main object to the dependencies for the kernel build 2014-09-07 07:09:22 -06:00
Gregory Nutt
b65500c289 If now a kernel build, then add the main object in with all of the rest 2014-09-07 07:05:54 -06:00
Gregory Nutt
22eb5d5c46 Update apps/examples/helloxx/Makefile 2014-09-07 06:59:30 -06:00
Gregory Nutt
181b75301f Customize the program name in the generic setup that was added to each makefile that installs a program 2014-09-06 13:30:44 -06:00
Gregory Nutt
3454362678 Add generic setup logic to every Makefile that installs a program. Each will need customization 2014-09-06 13:19:02 -06:00
Gregory Nutt
cedf1d7369 Fix all install targets 2014-09-06 13:01:44 -06:00
Gregory Nutt
72cd42282c Oops wrong else 2014-09-06 10:54:58 -06:00
Gregory Nutt
753f347723 Add missing else from last big change 2014-09-06 10:51:18 -06:00
Gregory Nutt
544cfc8aa2 Add program installation for CONFIG_BUILD_KERNEL in all Makefiles that build a main() 2014-09-06 10:42:03 -06:00
Gregory Nutt
d8a239d649 Use more standard *argv[] instead easier **argv 2014-09-06 09:23:23 -06:00
Gregory Nutt
9f7c9b273f With kernel build, entry point to all tasks is main, not some xyz_main 2014-09-06 09:19:15 -06:00
Gregory Nutt
d6bcd1a93a Add an install target to all makefiles. For the import build, the top-level Makefile now does two passes: (1) builds libapp.a, then (2) installs the programs (not yet finished) 2014-09-06 08:00:47 -06:00
Gregory Nutt
dd8d40dabd Remove final traces of the 8015 from the NuttX source tree 2014-09-01 13:21:15 -06:00
Gregory Nutt
7fca1ae30c wdog.h does not contain any application interface, only internal OS interface. Further, it is non-standard. Move wdog.h from include/ to include/nuttx. For the same reason, move the description of the watchdog timer interfaces from the Users Guide to the Porting Guide. 2014-08-21 11:16:55 -06:00
Gregory Nutt
39cd029b28 Cosmetic 2014-08-17 09:46:42 -06:00
Gregory Nutt
9efd3f8323 uIP webserver: Missing logic to close sockets on loop termination. From Max. 2014-07-28 07:23:04 -06:00
Gregory Nutt
767f1b2993 Fix netutils configuration issues: CONFIG_NETUTILS_HTTPD_SENDFILE was missing from Kconfig; CONFIG_NET_HAVE_SOLINGER should be CONFIG_NET_SOLINGER; Type of CONFIG_NET_HTTPD_MAXPATH was wrong in Kconfig file. From Max 2014-07-11 12:30:23 -06:00
Gregory Nutt
aa48010271 WGET: Fix from Rony Xln 2014-07-08 07:29:38 -06:00
Gregory Nutt
42d4d7a7e0 NET: Most of the contents of include/nuttx/net/udp.h moved to net/pkt/udp.h 2014-07-05 14:40:29 -06:00
Gregory Nutt
5355664353 NET: Another missing header file. Noted by Manuel Sthn 2014-07-05 07:06:51 -06:00
Gregory Nutt
633fae427d NET: emoved all includes of uip.h; added includes of ip.h wherever needed. Tried to fix problems of the now missing sneak inclusions because uip.h was removed. There are probably a few of these that were missed. 2014-07-04 19:13:08 -06:00
Gregory Nutt
069c43a5dd Remove all inclusion of uip.h 2014-07-04 16:58:22 -06:00
Gregory Nutt
97d6f97df7 NET: in-progress change... don't use 2014-07-04 16:38:51 -06:00
Gregory Nutt
fcffe2e824 NET: More renaming 2014-07-04 15:40:49 -06:00
Gregory Nutt
e7fedfa4a5 NET: Rename functions in apps/netutils/netlib to begin with netlib_ vs uip_ 2014-07-02 16:52:02 -06:00
Gregory Nutt
d8e69bb0c1 Rename files apps/netutils/netlib/uip_*.c to apps/netutils/netlib/netlib_*.c 2014-07-02 16:16:51 -06:00
Gregory Nutt
2ee5041477 NET: Rename uiplib/UIPLIB to netlib/NETLIB 2014-07-02 16:04:25 -06:00
Gregory Nutt
44ea3903f9 DHCPD: Missed name change uip_lock->net_lock 2014-06-30 19:31:27 -06:00
Gregory Nutt
b7d73dab81 NET: Rename uip_ipaddr* to net_ipaddr* 2014-06-29 13:11:08 -06:00
Gregory Nutt
165e5df670 NET: Renaming of IP address types 2014-06-29 12:22:50 -06:00
Gregory Nutt
80f8944eeb Fixes for networking and tiny webserver from Max 2014-06-29 09:30:09 -06:00
Gregory Nutt
7a7976652e Clean up all UDP-related naming 2014-06-24 18:55:01 -06:00
Gregory Nutt
817e256db3 Move the remaining files from include/nuttx/net/uip to include/nuttx/net; Rename *_internal.h header files in net/ to just *.h 2014-06-24 10:14:15 -06:00
Gregory Nutt
d76252f196 Move include/nuttx/net/uipopt.h to include/nuttx/net/netconfig.h 2014-06-24 08:53:28 -06:00
Gregory Nutt
4fddd6a3f7 httpd_fs_open() should return OK on success and ERROR on failure, not 1 and 0 2014-06-23 12:57:03 -06:00
Gregory Nutt
d7372fbdbc Costmetic changes after review for sense of OK (should be zero) 2014-06-19 07:58:43 -06:00
Gregory Nutt
86a4890fca Move include/nuttx/net/uip/uip-arch.h to include/nuttx/net/arp.h; rename all uip_arp_ functions to arp_ 2014-05-30 12:13:06 -06:00
Gregory Nutt
2b0f1ed109 Change all variadic macros to C99 style 2014-05-22 09:01:51 -06:00
Gregory Nutt
9ef702f5b1 zkit-arm-1769: Refreshed all configurations 2014-04-19 09:18:38 -06:00
Gregory Nutt
b9cf7acb1a More trailing whilespace removal 2014-04-13 16:24:28 -06:00
Gregory Nutt
7d961b6c93 Cosmetic changes for coding style; removal of dangling spaces at the end of lines 2014-04-13 13:18:06 -06:00
Gregory Nutt
171db56b69 Make sure that there is one space after for 2014-04-12 13:28:22 -06:00
Gregory Nutt
bb851fc8b5 Make sure that there is one space between while and condition 2014-04-12 13:09:48 -06:00
Gregory Nutt
17702dbad2 Make sure that there is one space between if and condition 2014-04-12 12:53:19 -06:00
Gregory Nutt
638fad2d36 Corrections to the NTP client from Manuel Stuehn 2014-04-12 08:03:03 -06:00
Gregory Nutt
e2153dd2b7 Accidentally checked in a .built file 2014-04-11 13:46:11 -06:00
Gregory Nutt
a0d6777c23 Breadk dnsclient.c file into three smaller files: dns_resolver.c, dns_socket.c, and dns_gethostip.c 2014-04-11 13:43:15 -06:00
Gregory Nutt
8b386385ab The rest of the resolv->DNS client naming change: Renamed directories and header files 2014-04-11 12:41:13 -06:00
Gregory Nutt
51f553c9a4 Long needed clean up of DNS resolver for coding style and naming conventions 2014-04-11 12:25:32 -06:00
Gregory Nutt
396316881e NTP client: Fix a time calculation for the case of CPUs that do not support long long 2014-04-11 09:24:59 -06:00
Gregory Nutt
e72ec4ad00 NTP client, more clean-up and minor enhancements 2014-04-11 09:02:50 -06:00
Gregory Nutt
b2080e94f7 NTP client, minor clean-up and enhancements 2014-04-11 08:27:15 -06:00
Gregory Nutt
693d73cc0d apps/netutils/ntpclient: Add a primitive NTP client. Initial checkin is untested and probably incomplete 2014-04-10 18:15:06 -06:00
Gregory Nutt
217aa7835e DHCPD: Correct value of PAD option is 0, not 1. From Brennan Ashton 2014-03-31 12:33:52 -06:00
Gregory Nutt
65b0ea1b8c Add missing DHCPD configuration settings 2014-03-03 18:12:45 -06:00
Gregory Nutt
9b172004c0 dhcpd_allocipaddr() should not call ntohl(). The return value is already in host order. From Brennan Ashton 2014-03-03 17:46:56 -06:00
Gregory Nutt
da0235e8e6 Olimex LPC1766STK: FTPC configure changed to use the kconfig-fronteds tools by Alan Carvalho de Assis 2014-02-20 15:34:59 -06:00
Gregory Nutt
4183932d04 Typo fixes from CCTSA0. Thanks 2014-02-14 11:08:05 -06:00
Gregory Nutt
3669b6799a More changes to reduce complaints from CppCheck. Some latent bugs fixes, but probably some new typos introduced 2014-02-10 19:11:56 -06:00
Gregory Nutt
c21071dfd3 VI: all commands not seem functional. Still at least on display artifact and probably some things not properly tested 2014-01-21 11:29:49 -06:00
Gregory Nutt
1919b2f6a3 Networking: Improved status reporting and new carrier management interfaces. From Max Holtzberg 2014-01-21 10:21:45 -06:00
Gregory Nutt
d89adb76d8 If write buffering is enabled, then it is necessary to release the write buffer resources (callback structure) when the socket is closed 2014-01-14 18:19:43 -06:00
Gregory Nutt
af14026800 Change how TCP read-ahead is selected to better integrate with TCP write buffering 2014-01-13 13:55:51 -06:00
Gregory Nutt
e0156d95a1 NSH Configuration: Refactor networking and netutils dependencies 2014-01-09 10:46:28 -06:00
Gregory Nutt
e7184c27db Viewtool STM32F107: Add a NSH configuration with network support 2013-12-25 12:14:24 -06:00
Gregory Nutt
b914af7836 Telnetd: Missing argument in debug statement can cause crash in certain error conditions. From David Sidrane 2013-10-24 07:21:56 -06:00
Gregory Nutt
dec3293e02 apps/examples/cc3000: Extensions and enhancements from David Sidrane 2013-10-23 08:25:40 -06:00
Gregory Nutt
73e10bd839 New touchscreen scaling algorithm for the case where measured X values vary with y position (and vice versa) 2013-10-17 12:07:14 -06:00
Gregory Nutt
31a0c289d7 Clean-up routing table design. 2013-10-05 12:05:51 -06:00
Gregory Nutt
6678759e5f SAMA5 EMAC: Changes from early debug sessions. Still a way to go 2013-09-17 15:52:19 -06:00
Gregory Nutt
09f534db73 DHCPD: Fix calculation of lease address. Bad logic causes repeated assignment of the same IP address. SourceForge bug #21 from Paolo Messina. 2013-09-06 08:10:54 -06:00
Gregory Nutt
b673cbebb9 Updates to README files 2013-06-01 17:25:16 -06:00
Gregory Nutt
424fbe6583 .dSYM only needs to be in the same .gitignore files as .exe 2013-05-30 15:02:04 -06:00