Guest User

Untitled

a guest
Jan 22nd, 2018
95
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 5.57 KB | None | 0 0
  1. diff libosip2-3.2.0/src/osipparser2//Makefile libosip2-3.3.0/src/osipparser2//Makefile
  2. 116c116
  3. < ACLOCAL = ${SHELL} /home/tugstugi/Downloads/Test/libosip2-3.2.0/scripts/missing --run aclocal-1.9 -I scripts
  4. ---
  5. > ACLOCAL = ${SHELL} /home/tugstugi/Downloads/Test/libosip2-3.3.0/scripts/missing --run aclocal-1.9 -I scripts
  6. 119c119
  7. < AMTAR = ${SHELL} /home/tugstugi/Downloads/Test/libosip2-3.2.0/scripts/missing --run tar
  8. ---
  9. > AMTAR = ${SHELL} /home/tugstugi/Downloads/Test/libosip2-3.3.0/scripts/missing --run tar
  10. 122,124c122,124
  11. < AUTOCONF = ${SHELL} /home/tugstugi/Downloads/Test/libosip2-3.2.0/scripts/missing --run autoconf
  12. < AUTOHEADER = ${SHELL} /home/tugstugi/Downloads/Test/libosip2-3.2.0/scripts/missing --run autoheader
  13. < AUTOMAKE = ${SHELL} /home/tugstugi/Downloads/Test/libosip2-3.2.0/scripts/missing --run automake-1.9
  14. ---
  15. > AUTOCONF = ${SHELL} /home/tugstugi/Downloads/Test/libosip2-3.3.0/scripts/missing --run autoconf
  16. > AUTOHEADER = ${SHELL} /home/tugstugi/Downloads/Test/libosip2-3.3.0/scripts/missing --run autoheader
  17. > AUTOMAKE = ${SHELL} /home/tugstugi/Downloads/Test/libosip2-3.3.0/scripts/missing --run automake-1.9
  18. 170c170
  19. < MAKEINFO = ${SHELL} /home/tugstugi/Downloads/Test/libosip2-3.2.0/scripts/missing --run makeinfo
  20. ---
  21. > MAKEINFO = ${SHELL} /home/tugstugi/Downloads/Test/libosip2-3.3.0/scripts/missing --run makeinfo
  22. 174c174
  23. < OSIP_VERSION = 3.2.0
  24. ---
  25. > OSIP_VERSION = 3.3.0
  26. 195c195
  27. < VERSION = 3.2.0
  28. ---
  29. > VERSION = 3.3.0
  30. 227c227
  31. < install_sh = /home/tugstugi/Downloads/Test/libosip2-3.2.0/scripts/install-sh
  32. ---
  33. > install_sh = /home/tugstugi/Downloads/Test/libosip2-3.3.0/scripts/install-sh
  34. diff libosip2-3.2.0/src/osipparser2//osip_port.c libosip2-3.3.0/src/osipparser2//osip_port.c
  35. 872a873,892
  36. > #ifdef WIN32
  37. >
  38. > #include <time.h>
  39. > #include <sys/timeb.h>
  40. >
  41. > int
  42. > __osip_port_gettimeofday (struct timeval *tp, void *tz)
  43. > {
  44. > struct _timeb timebuffer;
  45. >
  46. > _ftime (&timebuffer);
  47. > tp->tv_sec = (long) timebuffer.time;
  48. > tp->tv_usec = timebuffer.millitm * 1000;
  49. > return OSIP_SUCCESS;
  50. > }
  51. > #elif defined(__linux)
  52. > #include <sys/time.h>
  53. > #define __osip_port_gettimeofday gettimeofday
  54. > #endif
  55. >
  56. 878c898,916
  57. <
  58. ---
  59. > int relative_time=0;
  60. >
  61. > #if defined(WIN32) || defined(__linux)
  62. > static struct timeval start={0,0};
  63. > struct timeval now;
  64. >
  65. > if (start.tv_sec==0 && start.tv_usec==0)
  66. > {
  67. > __osip_port_gettimeofday(&start, NULL);
  68. > }
  69. > __osip_port_gettimeofday(&now, NULL);
  70. >
  71. > relative_time = 1000*(now.tv_sec - start.tv_sec);
  72. > if (now.tv_usec - start.tv_usec>0)
  73. > relative_time = relative_time + ((now.tv_usec - start.tv_usec)/1000);
  74. > else
  75. > relative_time = relative_time -1 + ((now.tv_usec - start.tv_usec)/1000);
  76. > #endif
  77. >
  78. 901,902c939,940
  79. < if (level == OSIP_FATAL)
  80. < fprintf (f, "| FATAL | <%s: %i> ", fi, li);
  81. ---
  82. > if (level == OSIP_FATAL)
  83. > fprintf (f, "| FATAL | %i <%s: %i> ", relative_time, fi, li);
  84. 904c942
  85. < fprintf (f, "| BUG | <%s: %i> ", fi, li);
  86. ---
  87. > fprintf (f, "| BUG | %i <%s: %i> ", relative_time, fi, li);
  88. 906c944
  89. < fprintf (f, "| ERROR | <%s: %i> ", fi, li);
  90. ---
  91. > fprintf (f, "| ERROR | %i <%s: %i> ", relative_time, fi, li);
  92. 908c946
  93. < fprintf (f, "|WARNING| <%s: %i> ", fi, li);
  94. ---
  95. > fprintf (f, "|WARNING| %i <%s: %i> ", relative_time, fi, li);
  96. 910c948
  97. < fprintf (f, "| INFO1 | <%s: %i> ", fi, li);
  98. ---
  99. > fprintf (f, "| INFO1 | %i <%s: %i> ", relative_time, fi, li);
  100. 912c950
  101. < fprintf (f, "| INFO2 | <%s: %i> ", fi, li);
  102. ---
  103. > fprintf (f, "| INFO2 | %i <%s: %i> ", relative_time, fi, li);
  104. 914c952
  105. < fprintf (f, "| INFO3 | <%s: %i> ", fi, li);
  106. ---
  107. > fprintf (f, "| INFO3 | %i <%s: %i> ", relative_time, fi, li);
  108. 916,917c954,955
  109. < fprintf (f, "| INFO4 | <%s: %i> ", fi, li);
  110. <
  111. ---
  112. > fprintf (f, "| INFO4 | %i <%s: %i> ", relative_time, fi, li);
  113. >
  114. 973c1011,1014
  115. <
  116. ---
  117. > #ifdef DISPLAY_TIME
  118. > int relative_time;
  119. > #endif
  120. >
  121. 976c1017
  122. < in = _snprintf (buffer, 511, "| FATAL | <%s: %i> ", fi, li);
  123. ---
  124. > in = _snprintf (buffer, 511, "| FATAL | %i <%s: %i> ", relative_time, fi, li);
  125. 978c1019
  126. < in = _snprintf (buffer, 511, "| BUG | <%s: %i> ", fi, li);
  127. ---
  128. > in = _snprintf (buffer, 511, "| BUG | %i <%s: %i> ", relative_time, fi, li);
  129. 980c1021
  130. < in = _snprintf (buffer, 511, "| ERROR | <%s: %i> ", fi, li);
  131. ---
  132. > in = _snprintf (buffer, 511, "| ERROR | %i <%s: %i> ", relative_time, fi, li);
  133. 982c1023
  134. < in = _snprintf (buffer, 511, "|WARNING| <%s: %i> ", fi, li);
  135. ---
  136. > in = _snprintf (buffer, 511, "|WARNING| %i <%s: %i> ", relative_time, fi, li);
  137. 984c1025
  138. < in = _snprintf (buffer, 511, "| INFO1 | <%s: %i> ", fi, li);
  139. ---
  140. > in = _snprintf (buffer, 511, "| INFO1 | %i <%s: %i> ", relative_time, fi, li);
  141. 986c1027
  142. < in = _snprintf (buffer, 511, "| INFO2 | <%s: %i> ", fi, li);
  143. ---
  144. > in = _snprintf (buffer, 511, "| INFO2 | %i <%s: %i> ", relative_time, fi, li);
  145. 988c1029
  146. < in = _snprintf (buffer, 511, "| INFO3 | <%s: %i> ", fi, li);
  147. ---
  148. > in = _snprintf (buffer, 511, "| INFO3 | %i <%s: %i> ", relative_time, fi, li);
  149. 990c1031
  150. < in = _snprintf (buffer, 511, "| INFO4 | <%s: %i> ", fi, li);
  151. ---
  152. > in = _snprintf (buffer, 511, "| INFO4 | %i <%s: %i> ", relative_time, fi, li);
  153. diff libosip2-3.2.0/src/osipparser2//osip_uri.c libosip2-3.3.0/src/osipparser2//osip_uri.c
  154. 480a481
  155. > __osip_uri_unescape (pvalue);
  156. 494a496
  157. > __osip_uri_unescape (pname);
Add Comment
Please, Sign In to add comment