Google Git
Sign in
android/platform/external/libpcap/refs/heads/oreo-mr1-dev
commit
a2d6390fdbbaaa2b796d1119ed9f8678364dccdd
[log]
author
Elliott Hughes <enh@google.com>
Tue May 16 01:48:01 2017 +0000
committer
android-build-merger <android-build-merger@google.com>
Tue May 16 01:48:01 2017 +0000
tree
6589a2831784a580a0c93c7bbc89cb541a297344
parent
965a4b5291eead2d8f826d2c87e58a12bb56a214 [diff]
parent
7b7f0b469ad512b9b5c759344eb0663e7c2eb191 [diff]
resolve merge conflicts of 4f1b2ce to oc-dev-plus-aosp
am: 7b7f0b469a

Change-Id: Ic6605c6b8bfbc73fb25e0941df265db53604f719
tree: 6589a2831784a580a0c93c7bbc89cb541a297344
  1. bpf/
  2. ChmodBPF/
  3. cmake/
  4. config/
  5. lbl/
  6. missing/
  7. msdos/
  8. pcap/
  9. SUNOS4/
  10. tests/
  11. Win32/
  12. bpf_filter.c ⇨ ./bpf/net/bpf_filter.c
  13. net ⇨ ./bpf/net
  14. .gitignore
  15. aclocal.m4
  16. Android.mk
  17. arcnet.h
  18. atmuni31.h
  19. bpf_dump.c
  20. bpf_image.c
  21. CHANGES
  22. chmod_bpf
  23. CleanSpec.mk
  24. cmakeconfig.h.in
  25. CMakeLists.txt
  26. config.guess
  27. config.h
  28. config.h.in
  29. config.sub
  30. configure
  31. configure.ac
  32. CREDITS
  33. dlpisubs.c
  34. dlpisubs.h
  35. etherent.c
  36. ethertype.h
  37. extract.h
  38. fad-getad.c
  39. fad-gifc.c
  40. fad-glifc.c
  41. fad-helpers.c
  42. gen_version_c.sh
  43. gen_version_header.sh
  44. gencode.c
  45. gencode.h
  46. GenVersion.bat
  47. grammar.c
  48. grammar.h
  49. grammar.y
  50. ieee80211.h
  51. inet.c
  52. install-sh
  53. INSTALL.txt
  54. LICENSE
  55. llc.h
  56. Makefile-devel-adds
  57. Makefile.in
  58. mkdep
  59. MODULE_LICENSE_BSD
  60. nametoaddr.c
  61. nametoaddr.h
  62. nlpid.h
  63. NOTICE
  64. optimize.c
  65. org.tcpdump.chmod_bpf.plist
  66. pcap-bpf.c
  67. pcap-bpf.h
  68. pcap-bt-linux.c
  69. pcap-bt-linux.h
  70. pcap-bt-monitor-linux.c
  71. pcap-bt-monitor-linux.h
  72. pcap-common.c
  73. pcap-common.h
  74. pcap-config
  75. pcap-config.1
  76. pcap-config.in
  77. pcap-dag.c
  78. pcap-dag.h
  79. pcap-dbus.c
  80. pcap-dbus.h
  81. pcap-dlpi.c
  82. pcap-dos.c
  83. pcap-dos.h
  84. pcap-enet.c
  85. pcap-filter.manmisc
  86. pcap-filter.manmisc.in
  87. pcap-int.h
  88. pcap-libdlpi.c
  89. pcap-linktype.manmisc
  90. pcap-linktype.manmisc.in
  91. pcap-linux.c
  92. pcap-namedb.h
  93. pcap-netfilter-linux-android.c
  94. pcap-netfilter-linux-android.h
  95. pcap-netfilter-linux.c
  96. pcap-netfilter-linux.h
  97. pcap-new.c
  98. pcap-nit.c
  99. pcap-null.c
  100. pcap-pf.c
  101. pcap-rpcap.c
  102. pcap-rpcap.h
  103. pcap-savefile.manfile
  104. pcap-savefile.manfile.in
  105. pcap-septel.c
  106. pcap-septel.h
  107. pcap-sita.c
  108. pcap-sita.h
  109. pcap-sita.html
  110. pcap-snf.c
  111. pcap-snf.h
  112. pcap-snit.c
  113. pcap-snoop.c
  114. pcap-stdinc.h
  115. pcap-tc.c
  116. pcap-tc.h
  117. pcap-tstamp.manmisc
  118. pcap-tstamp.manmisc.in
  119. pcap-usb-linux.c
  120. pcap-usb-linux.h
  121. pcap-win32.c
  122. pcap.3pcap
  123. pcap.3pcap.in
  124. pcap.c
  125. pcap.h
  126. pcap_activate.3pcap
  127. pcap_breakloop.3pcap
  128. pcap_can_set_rfmon.3pcap
  129. pcap_close.3pcap
  130. pcap_compile.3pcap
  131. pcap_compile.3pcap.in
  132. pcap_create.3pcap
  133. pcap_datalink.3pcap
  134. pcap_datalink.3pcap.in
  135. pcap_datalink_name_to_val.3pcap
  136. pcap_datalink_val_to_name.3pcap
  137. pcap_dump.3pcap
  138. pcap_dump_close.3pcap
  139. pcap_dump_file.3pcap
  140. pcap_dump_flush.3pcap
  141. pcap_dump_ftell.3pcap
  142. pcap_dump_open.3pcap
  143. pcap_dump_open.3pcap.in
  144. pcap_file.3pcap
  145. pcap_fileno.3pcap
  146. pcap_findalldevs.3pcap
  147. pcap_freecode.3pcap
  148. pcap_get_selectable_fd.3pcap
  149. pcap_get_tstamp_precision.3pcap
  150. pcap_get_tstamp_precision.3pcap.in
  151. pcap_geterr.3pcap
  152. pcap_inject.3pcap
  153. pcap_is_swapped.3pcap
  154. pcap_lib_version.3pcap
  155. pcap_list_datalinks.3pcap
  156. pcap_list_datalinks.3pcap.in
  157. pcap_list_tstamp_types.3pcap
  158. pcap_list_tstamp_types.3pcap.in
  159. pcap_lookupdev.3pcap
  160. pcap_lookupnet.3pcap
  161. pcap_loop.3pcap
  162. pcap_major_version.3pcap
  163. pcap_next_ex.3pcap
  164. pcap_offline_filter.3pcap
  165. pcap_open_dead.3pcap
  166. pcap_open_dead.3pcap.in
  167. pcap_open_live.3pcap
  168. pcap_open_offline.3pcap
  169. pcap_open_offline.3pcap.in
  170. pcap_set_buffer_size.3pcap
  171. pcap_set_datalink.3pcap
  172. pcap_set_immediate_mode.3pcap
  173. pcap_set_promisc.3pcap
  174. pcap_set_rfmon.3pcap
  175. pcap_set_snaplen.3pcap
  176. pcap_set_timeout.3pcap
  177. pcap_set_tstamp_precision.3pcap
  178. pcap_set_tstamp_precision.3pcap.in
  179. pcap_set_tstamp_type.3pcap
  180. pcap_set_tstamp_type.3pcap.in
  181. pcap_setdirection.3pcap
  182. pcap_setfilter.3pcap
  183. pcap_setnonblock.3pcap
  184. pcap_snapshot.3pcap
  185. pcap_stats.3pcap
  186. pcap_statustostr.3pcap
  187. pcap_strerror.3pcap
  188. pcap_tstamp_type_name_to_val.3pcap
  189. pcap_tstamp_type_val_to_name.3pcap
  190. pcap_version.h
  191. pcap_version.h.in
  192. portability.h
  193. ppp.h
  194. README
  195. README.aix
  196. README.dag
  197. README.hpux
  198. README.linux
  199. README.macosx
  200. README.septel
  201. README.sita
  202. README.tru64
  203. README.version
  204. README.Win32
  205. remote-ext.h
  206. savefile.c
  207. scanner.c
  208. scanner.h
  209. scanner.l
  210. sf-pcap-ng.c
  211. sf-pcap-ng.h
  212. sf-pcap.c
  213. sf-pcap.h
  214. sockutils.c
  215. sockutils.h
  216. sunatmpos.h
  217. TODO
  218. VERSION
  219. version.c