Merge psp-at1.ntp.org:/home/lokeshw24/ntp-stable-unity/

into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 557f4655-eYaxiHQc7GK_h8xMhL6UQ

diff --cc tests/libntp/Makefile.am
index c790b704956924bdee0fe08c42749e0896c918be,d0073233d824f49e4d36b346f95e8f1d657bc7a7..0daef1778a7fe44719bf84189040417e88d8654b
--- 1/tests/libntp/Makefile.am
--- 2/tests/libntp/Makefile.am
+++ b/tests/libntp/Makefile.am
@@@ -5,26 -5,10 +5,31 @@@ CLEANFILES 
  run_unity =   cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
  
  #removed test-libntp
 -check_PROGRAMS = test-modetoa test-uglydate test-ymd2yd test-statestr test-numtoa test-numtohost \
 -test-hextoint test-atoint test-atouint test-authkeys test-a_md5encrypt test-lfpfunc test-octtoint \
 -test-hextolfp test-netof test-socktoa
 +check_PROGRAMS =              \
 +      test-modetoa            \
 +      test-uglydate           \
 +      test-ymd2yd             \
 +      test-statestr           \
 +      test-numtoa             \
 +      test-numtohost          \
 +      test-hextoint           \
 +      test-atoint             \
 +      test-atouint            \
 +      test-authkeys           \
 +      test-a_md5encrypt       \
 +      test-lfpfunc            \
 +      test-vi64ops            \
 +      test-refnumtoa          \
 +      test-calyearstart       \
 +      test-clocktime          \
 +      test-caljulian          \
-       test-calendar
++      test-calendar           \
++      test-octtoint           \
++      test-hextolfp           \
++      test-netof              \
++      test-socktoa            \
 +      $(NULL)
+ #test-decodenetnum
  
  if GTEST_AVAILABLE
  check_PROGRAMS += tests
@@@ -69,26 -52,26 +74,26 @@@ tests_SOURCES =                                    
                g_atouint.cpp           \
                g_authkeys.cpp          \
                buftvtots.cpp           \
 -              calendar.cpp            \
 -              caljulian.cpp           \
 +              g_calendar.cpp          \
 +              g_caljulian.cpp         \
                caltontp.cpp            \
 -              calyearstart.cpp        \
 -              clocktime.cpp           \
 +              g_calyearstart.cpp      \
 +              g_clocktime.cpp         \
-               decodenetnum.cpp        \
+               g_decodenetnum.cpp      \
                g_hextoint.cpp          \
-               hextolfp.cpp            \
+               g_hextolfp.cpp          \
                humandate.cpp           \
                g_lfpfunc.cpp           \
                lfptostr.cpp            \
                g_modetoa.cpp           \
                msyslog.cpp             \
-               netof.cpp               \
+               g_netof.cpp             \
                g_numtoa.cpp            \
                g_numtohost.cpp         \
-               octtoint.cpp            \
+               g_octtoint.cpp          \
                prettydate.cpp          \
                recvbuff.cpp            \
 -              refnumtoa.cpp           \
 +              g_refnumtoa.cpp         \
                sfptostr.cpp            \
                socktoa.cpp             \
                ssl_init.cpp            \
@@@ -192,36 -173,68 +197,70 @@@ test_atoint_LDADD =                             
        $(unity_tests_LDADD)
        $(NULL)
  
- test_a_md5encrypt_CFLAGS =                    \
-       -I$(top_srcdir)/sntp/unity              \
+ test_octtoint_CFLAGS =                  \
+       -I$(top_srcdir)/sntp/unity      \
+       $(NULL)
+ 
+ test_octtoint_LDADD =                   \
+       $(unity_tests_LDADD)
+       $(NULL)
+ 
+ test_hextolfp_CFLAGS =                  \
+       -I$(top_srcdir)/sntp/unity      \
+       $(NULL)
+ 
+ test_hextolfp_LDADD =                   \
+       $(unity_tests_LDADD)
+       $(NULL)
+ 
+ test_netof_CFLAGS =                  \
+       -I$(top_srcdir)/sntp/unity      \
+       $(NULL)
+ 
+ test_netof_LDADD =                   \
+       $(unity_tests_LDADD)
+       $(NULL)
+ 
+ #test_decodenetnum_CFLAGS =                  \
+ #     -I$(top_srcdir)/sntp/unity      \
+ #     $(NULL)
+ #
+ #test_decodenetnum_LDADD =                   \
+ #     $(unity_tests_LDADD)
+ #     $(NULL)
+ 
+ test_socktoa_CFLAGS =                  \
+       -I$(top_srcdir)/sntp/unity      \
+       $(NULL)
+ 
 -test_socktoa_LDADD =                   \
 -      $(unity_tests_LDADD)
        $(NULL)
  
 +test_a_md5encrypt_LDADD =                     \
 +      $(unity_tests_LDADD)                    \
 +      $(NULL)
  
 -test_a_md5encrypt_CFLAGS =                  \
 -      -I$(top_srcdir)/sntp/unity      \
 +test_atouint_CFLAGS =                         \
 +      -I$(top_srcdir)/sntp/unity              \
        $(NULL)
  
 -test_a_md5encrypt_LDADD =                   \
 -      $(unity_tests_LDADD)            \
 +test_atouint_LDADD =                          \
 +      $(unity_tests_LDADD)
        $(NULL)
  
 -test_atouint_CFLAGS =                  \
 -      -I$(top_srcdir)/sntp/unity      \
 +test_authkeys_CFLAGS =                                \
 +      -I$(top_srcdir)/sntp/unity              \
        $(NULL)
  
 -test_atouint_LDADD =                   \
 -      $(unity_tests_LDADD)
 +test_authkeys_LDADD =                         \
 +      $(unity_tests_LDADD)                    \
        $(NULL)
  
 -test_authkeys_CFLAGS =                  \
 -      -I$(top_srcdir)/sntp/unity      \
 +test_lfpfunc_CFLAGS =                         \
 +      -I$(top_srcdir)/sntp/unity              \
 +      -DUNITY_INCLUDE_DOUBLE                  \
        $(NULL)
  
 -test_authkeys_LDADD =                           \
 +test_lfpfunc_LDADD =                          \
        $(unity_tests_LDADD)                    \
        $(NULL)
  
@@@ -286,117 -264,89 +325,137 @@@ test_modetoa_SOURCES =                        
        run-test-modetoa.c              \
        $(NULL)
  
 -test_uglydate_SOURCES =               \
 +test_uglydate_SOURCES =                       \
        uglydate.c                      \
 -      run-test-uglydate.c                     \
 +      run-test-uglydate.c             \
        $(NULL)
  
 -test_ymd2yd_SOURCES =                  \
 -      ymd2yd.c                       \
 -      run-test-ymd2yd.c              \
 +test_ymd2yd_SOURCES =                 \
 +      ymd2yd.c                        \
 +      run-test-ymd2yd.c               \
        $(NULL)
  
 -test_statestr_SOURCES =                  \
 -      statestr.c                       \
 -      run-test-statestr.c              \
 +test_statestr_SOURCES =                       \
 +      statestr.c                      \
 +      run-test-statestr.c             \
        $(NULL)
  
 -test_numtoa_SOURCES =                  \
 -      numtoa.c                       \
 -      run-test-numtoa.c              \
 +test_numtoa_SOURCES =                 \
 +      numtoa.c                        \
 +      run-test-numtoa.c               \
        $(NULL)
  
 -test_numtohost_SOURCES =                  \
 -      numtohost.c                       \
 -      run-test-numtohost.c              \
 +test_numtohost_SOURCES =              \
 +      numtohost.c                     \
 +      run-test-numtohost.c            \
        $(NULL)
  
 -test_hextoint_SOURCES =                  \
 -      hextoint.c                       \
 -      run-test-hextoint.c              \
 +test_hextoint_SOURCES =                       \
 +      hextoint.c                      \
 +      run-test-hextoint.c             \
        $(NULL)
  
 -test_atoint_SOURCES =                 \
 -      atoint.c                        \
 -      run-test-atoint.c               \
 +test_atoint_SOURCES =                 \
 +      atoint.c                        \
 +      run-test-atoint.c               \
        $(NULL)
  
- test_a_md5encrypt_SOURCES =           \
-       a_md5encrypt.c                  \
-       run-test-a_md5encrypt.c         \
+ test_octtoint_SOURCES =               \
+       octtoint.c                      \
+       run-test-octtoint.c                     \
+       $(NULL)
+ 
+ test_hextolfp_SOURCES =               \
+       hextolfp.c                      \
+       run-test-hextolfp.c                     \
+       $(NULL)
+ 
+ test_netof_SOURCES =                  \
+       netof.c                 \
+       run-test-netof.c                \
+       $(NULL)
+ 
+ #test_decodenetnum_SOURCES =                  \
+ #     decodenetnum.c                  \
+ #     run-test-decodenetnum.c                 \
+ #     $(NULL)
+ 
+ test_socktoa_SOURCES =                \
+       socktoa.c                       \
+       run-test-socktoa.c                      \
        $(NULL)
  
 +test_atouint_SOURCES =                        \
 +      atouint.c                       \
 +      run-test-atouint.c              \
 +      $(NULL)
 +
 +test_authkeys_SOURCES =                       \
 +      authkeys.c                      \
 +      run-test-authkeys.c             \
 +      $(NULL)
 +
 +test_lfpfunc_SOURCES =                        \
 +      lfpfunc.c                       \
 +      run-test-lfpfunc.c              \
 +      $(NULL)
 +
 +test_vi64ops_SOURCES =                        \
 +      vi64ops.c                       \
 +      run-test-vi64ops.c              \
 +      $(NULL)
  
 -test_a_md5encrypt_SOURCES =                   \
 -      a_md5encrypt.c                          \
 -      run-test-a_md5encrypt.c                 \
 +test_refnumtoa_SOURCES =              \
 +      refnumtoa.c                     \
 +      run-test-refnumtoa.c            \
        $(NULL)
  
 -test_atouint_SOURCES =                        \
 -      atouint.c                               \
 -      run-test-atouint.c                      \
 +test_calyearstart_SOURCES =           \
 +      calyearstart.c                  \
 +      run-test-calyearstart.c         \
 +      test-libntp.c                   \
        $(NULL)
  
 -test_authkeys_SOURCES =                       \
 -      authkeys.c                              \
 -      run-test-authkeys.c                     \
 +test_clocktime_SOURCES =              \
 +      clocktime.c                     \
 +      run-test-clocktime.c            \
 +      test-libntp.c                   \
        $(NULL)
  
 -test_lfpfunc_SOURCES =                                \
 -      lfpfunc.c                               \
 -      run-test-lfpfunc.c                      \
 +test_caljulian_SOURCES =              \
 +      caljulian.c                     \
 +      run-test-caljulian.c            \
 +      test-libntp.c                   \
        $(NULL)
  
 +test_calendar_SOURCES =                               \
 +      calendar.c                              \
 +      run-test-calendar.c                     \
 +      test-libntp.c                           \
 +      $(NULL)
  
  
 +BUILT_SOURCES +=                              \
 +      $(srcdir)/run-test-a_md5encrypt.c       \
 +      $(srcdir)/run-test-atoint.c             \
 +      $(srcdir)/run-test-atouint.c            \
 +      $(srcdir)/run-test-authkeys.c           \
 +      $(srcdir)/run-test-caljulian.c          \
 +      $(srcdir)/run-test-calyearstart.c       \
 +      $(srcdir)/run-test-clocktime.c          \
 +      $(srcdir)/run-test-hextoint.c           \
 +      $(srcdir)/run-test-lfpfunc.c            \
 +      $(srcdir)/run-test-modetoa.c            \
 +      $(srcdir)/run-test-numtoa.c             \
 +      $(srcdir)/run-test-numtohost.c          \
 +      $(srcdir)/run-test-refnumtoa.c          \
 +      $(srcdir)/run-test-statestr.c           \
 +      $(srcdir)/run-test-uglydate.c           \
 +      $(srcdir)/run-test-vi64ops.c            \
 +      $(srcdir)/run-test-ymd2yd.c             \
 +      $(srcdir)/run-test-calendar.c           \
 +      $(NULL)
 +
  $(srcdir)/run-test-modetoa.c: $(srcdir)/modetoa.c $(std_unity_list)
        $(run_unity) modetoa.c run-test-modetoa.c