June 2008 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Added useful TRACEs.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 337f1b73937a7ebe8de88c45bf164272ac235249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=337f1b73937a7ebe8de88c45b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 25 19:28:21 2008 -0500 mshtml: Added useful TRACEs. --- dlls/mshtml/htmlevent.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index eb29241..f98e3a1 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -402,7 +402,9 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target) if(node->event_target && node->event_target->event_table[eid]) { doc->window->event = create_event(); + TRACE("%s >>>\n", debugstr_w(event_info[eid].name)); call_disp_func(doc, node->event_target->event_table[eid]); + TRACE("%s <<<\n", debugstr_w(event_info[eid].name)); IHTMLEventObj_Release(doc->window->event); doc->window->event = NULL;

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode::get_parentNode implementation.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: beeaea11763e06b2c2233c210734413c9b07e386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beeaea11763e06b2c2233c210… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 25 19:28:37 2008 -0500 mshtml: Added IHTMLDOMNode::get_parentNode implementation. --- dlls/mshtml/htmlnode.c | 23 +++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index d46d75c..b802e90 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -386,8 +386,27 @@ static HRESULT WINAPI HTMLDOMNode_get_nodeType(IHTMLDOMNode *iface, long *p) static HRESULT WINAPI HTMLDOMNode_get_parentNode(IHTMLDOMNode *iface, IHTMLDOMNode **p) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HTMLDOMNode *node; + nsIDOMNode *nsnode; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMNode_GetParentNode(This->nsnode, &nsnode); + if(NS_FAILED(nsres)) { + ERR("GetParentNode failed: %08x\n", nsres); + return E_FAIL; + } + + if(!nsnode) { + *p = NULL; + return S_OK; + } + + node = get_node(This->doc, nsnode, TRUE); + *p = HTMLDOMNODE(node); + IHTMLDOMNode_AddRef(*p); + return S_OK; } static HRESULT WINAPI HTMLDOMNode_hasChildNodes(IHTMLDOMNode *iface, VARIANT_BOOL *fChildren) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a1b2e66..0748c89 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -900,6 +900,20 @@ static void _test_node_has_child(unsigned line, IUnknown *unk, VARIANT_BOOL exb) IHTMLDOMNode_Release(node); } +#define test_node_get_parent(u) _test_node_get_parent(__LINE__,u) +static IHTMLDOMNode *_test_node_get_parent(unsigned line, IUnknown *unk) +{ + IHTMLDOMNode *node = _get_node_iface(line, unk); + IHTMLDOMNode *parent; + HRESULT hres; + + hres = IHTMLDOMNode_get_parentNode(node, &parent); + IHTMLDOMNode_Release(node); + ok_(__FILE__,line) (hres == S_OK, "get_parentNode failed: %08x\n", hres); + + return parent; +} + #define get_node_type(n) _get_node_type(__LINE__,n) static long _get_node_type(unsigned line, IUnknown *unk) { @@ -2042,6 +2056,22 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_set_class((IUnknown*)elem, NULL); test_elem_tabindex((IUnknown*)elem, 0); test_elem_set_tabindex((IUnknown*)elem, 1); + + node = test_node_get_parent((IUnknown*)elem); + ok(node != NULL, "node == NULL\n"); + test_node_name((IUnknown*)node, "BODY"); + node2 = test_node_get_parent((IUnknown*)node); + IHTMLDOMNode_Release(node); + ok(node2 != NULL, "node == NULL\n"); + test_node_name((IUnknown*)node2, "HTML"); + node = test_node_get_parent((IUnknown*)node2); + IHTMLDOMNode_Release(node2); + ok(node != NULL, "node == NULL\n"); + test_node_name((IUnknown*)node, "#document"); + node2 = test_node_get_parent((IUnknown*)node); + IHTMLDOMNode_Release(node); + ok(node2 == NULL, "node != NULL\n"); + IHTMLElement_Release(elem); }

1 0

Eric Durbin : iphlpapi: Implement getNumArpEntries on FreeBSD.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 6ea3796cdb09c741eb37ab44842846d303b5bf69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea3796cdb09c741eb37ab448… Author: Eric Durbin <eadurbin(a)freebsd.org> Date: Tue Jun 24 22:49:15 2008 -0500 iphlpapi: Implement getNumArpEntries on FreeBSD. --- configure | 2 ++ configure.ac | 1 + dlls/iphlpapi/ipstats.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 3 +++ 4 files changed, 52 insertions(+), 0 deletions(-) diff --git a/configure b/configure index ca119ac..11d49ad 100755 --- a/configure +++ b/configure @@ -7088,6 +7088,7 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -7136,6 +7137,7 @@ for ac_header in \ mntent.h \ ncurses.h \ netdb.h \ + netinet/if_ether.h \ netinet/in.h \ netinet/in_systm.h \ netinet/ip_icmp.h \ diff --git a/configure.ac b/configure.ac index 192dd03..c71427e 100644 --- a/configure.ac +++ b/configure.ac @@ -273,6 +273,7 @@ AC_CHECK_HEADERS(\ mntent.h \ ncurses.h \ netdb.h \ + netinet/if_ether.h \ netinet/in.h \ netinet/in_systm.h \ netinet/ip_icmp.h \ diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 2b6c0f7..89ffa04 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -46,6 +46,9 @@ #ifdef HAVE_NET_IF_H #include <net/if.h> #endif +#ifdef HAVE_NET_IF_DL_H +#include <net/if_dl.h> +#endif #ifdef HAVE_NET_IF_TYPES_H #include <net/if_types.h> #endif @@ -55,6 +58,9 @@ #ifdef HAVE_NET_IF_ARP_H #include <net/if_arp.h> #endif +#ifdef HAVE_NETINET_IF_ETHER_H +#include <netinet/if_ether.h> +#endif #ifdef HAVE_NETINET_TCP_H #include <netinet/tcp.h> #endif @@ -1234,6 +1240,46 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE *ppIpForwardTable, HANDLE heap, DWORD getNumArpEntries(void) { +#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) + int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO}; +#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) + DWORD arpEntries = 0; + size_t needed; + char *buf, *lim, *next; + struct rt_msghdr *rtm; + struct sockaddr_inarp *sinarp; + struct sockaddr_dl *sdl; + + if (sysctl (mib, MIB_LEN, NULL, &needed, NULL, 0) == -1) + { + ERR ("failed to get size of arp table\n"); + return 0; + } + + buf = HeapAlloc (GetProcessHeap (), 0, needed); + if (!buf) return 0; + + if (sysctl (mib, MIB_LEN, buf, &needed, NULL, 0) == -1) + { + ERR ("failed to get arp table\n"); + HeapFree (GetProcessHeap (), 0, buf); + return 0; + } + + lim = buf + needed; + next = buf; + while(next < lim) + { + rtm = (struct rt_msghdr *)next; + sinarp=(struct sockaddr_inarp *)(rtm + 1); + sdl = (struct sockaddr_dl *)((char *)sinarp + ROUNDUP(sinarp->sin_len)); + if(sdl->sdl_alen) /* arp entry */ + arpEntries++; + next += rtm->rtm_msglen; + } + HeapFree (GetProcessHeap (), 0, buf); + return arpEntries; +#endif return getNumWithOneHeader("/proc/net/arp"); } diff --git a/include/config.h.in b/include/config.h.in index 40f62a9..63e8e89 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -441,6 +441,9 @@ /* Define to 1 if you have the <netinet/icmp_var.h> header file. */ #undef HAVE_NETINET_ICMP_VAR_H +/* Define to 1 if you have the <netinet/if_ether.h> header file. */ +#undef HAVE_NETINET_IF_ETHER_H + /* Define to 1 if you have the <netinet/in.h> header file. */ #undef HAVE_NETINET_IN_H

1 0

Eric Durbin : iphlpapi: Implement getTCPStats on FreeBSD.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: beea4d30062b646ee0102be3366d57a4a7110e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beea4d30062b646ee0102be33… Author: Eric Durbin <eadurbin(a)freebsd.org> Date: Tue Jun 24 22:47:33 2008 -0500 iphlpapi: Implement getTCPStats on FreeBSD. --- configure | 3 ++- configure.ac | 2 +- dlls/iphlpapi/ipstats.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 3 +++ include/iprtrmib.h | 4 ++++ 5 files changed, 50 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 6dac855..ca119ac 100755 --- a/configure +++ b/configure @@ -7559,7 +7559,8 @@ done -for ac_header in netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h + +for ac_header in netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h netinet/tcp_timer.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_header" >&5 diff --git a/configure.ac b/configure.ac index eb04796..192dd03 100644 --- a/configure.ac +++ b/configure.ac @@ -362,7 +362,7 @@ AC_CHECK_HEADERS([netinet/in_pcb.h netinet/ip_var.h net/if.h net/if_arp.h net/if # include <netinet/in.h> #endif]) -AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h],,, +AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h netinet/tcp_timer.h ],,, [#include <sys/types.h> #ifdef HAVE_ALIAS_H # include <alias.h> diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 4128875..2b6c0f7 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -68,6 +68,9 @@ #ifdef HAVE_NETINET_TCP_VAR_H #include <netinet/tcp_var.h> #endif +#ifdef HAVE_NETINET_TCP_TIMER_H +#include <netinet/tcp_timer.h> +#endif #ifdef HAVE_NETINET_IP_ICMP_H #include <netinet/ip_icmp.h> #endif @@ -618,6 +621,42 @@ DWORD getIPStats(PMIB_IPSTATS stats) DWORD getTCPStats(MIB_TCPSTATS *stats) { +#if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) + int mib[] = {CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_STATS}; +#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) +#define hz 1000 + struct tcpstat tcp_stat; + size_t needed; + + if (!stats) + return ERROR_INVALID_PARAMETER; + needed = sizeof(tcp_stat); + + if(sysctl(mib, MIB_LEN, &tcp_stat, &needed, NULL, 0) == -1) + { + ERR ("failed to get tcpstat\n"); + return ERROR_NOT_SUPPORTED; + } + + stats->dwRtoAlgorithm = MIB_TCP_RTO_VANJ; + stats->dwRtoMin = TCPTV_MIN; + stats->dwRtoMax = TCPTV_REXMTMAX; + stats->dwMaxConn = -1; + stats->dwActiveOpens = tcp_stat.tcps_connattempt; + stats->dwPassiveOpens = tcp_stat.tcps_accepts; + stats->dwAttemptFails = tcp_stat.tcps_conndrops; + stats->dwEstabResets = tcp_stat.tcps_drops; + stats->dwCurrEstab = 0; + stats->dwInSegs = tcp_stat.tcps_rcvtotal; + stats->dwOutSegs = tcp_stat.tcps_sndtotal - tcp_stat.tcps_sndrexmitpack; + stats->dwRetransSegs = tcp_stat.tcps_sndrexmitpack; + stats->dwInErrs = tcp_stat.tcps_rcvbadsum + tcp_stat.tcps_rcvbadoff + tcp_stat.tcps_rcvmemdrop + tcp_stat.tcps_rcvshort; + stats->dwOutRsts = tcp_stat.tcps_sndctrl - tcp_stat.tcps_closed; + stats->dwNumConns = tcp_stat.tcps_connects; + + return NO_ERROR; + +#else FILE *fp; if (!stats) @@ -710,6 +749,7 @@ DWORD getTCPStats(MIB_TCPSTATS *stats) } return NO_ERROR; +#endif } DWORD getUDPStats(MIB_UDPSTATS *stats) diff --git a/include/config.h.in b/include/config.h.in index 9bef3c3..40f62a9 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -462,6 +462,9 @@ /* Define to 1 if you have the <netinet/tcp.h> header file. */ #undef HAVE_NETINET_TCP_H +/* Define to 1 if you have the <netinet/tcp_timer.h> header file. */ +#undef HAVE_NETINET_TCP_TIMER_H + /* Define to 1 if you have the <netinet/tcp_var.h> header file. */ #undef HAVE_NETINET_TCP_VAR_H diff --git a/include/iprtrmib.h b/include/iprtrmib.h index ba84cc5..cf2bb24 100644 --- a/include/iprtrmib.h +++ b/include/iprtrmib.h @@ -261,6 +261,10 @@ typedef struct _MIB_IPNETROW DWORD dwType; } MIB_IPNETROW, *PMIB_IPNETROW; +#define MIB_TCP_RTO_OTHER 1 +#define MIB_TCP_RTO_CONSTANT 2 +#define MIB_TCP_RTO_RSRE 3 +#define MIB_TCP_RTO_VANJ 4 #define MIB_IPNET_TYPE_OTHER 1 #define MIB_IPNET_TYPE_INVALID 2 #define MIB_IPNET_TYPE_DYNAMIC 3

1 0

Eric Durbin : iphlpapi: Fix a typo resulting in wrong variable assignment.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 3d122aec41215e2575ef7dabb8a3ed54e7983957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d122aec41215e2575ef7dabb… Author: Eric Durbin <eadurbin(a)freebsd.org> Date: Tue Jun 24 22:46:39 2008 -0500 iphlpapi: Fix a typo resulting in wrong variable assignment. --- dlls/iphlpapi/ipstats.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 8d35c5f..4128875 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -651,7 +651,7 @@ DWORD getTCPStats(MIB_TCPSTATS *stats) ptr = endPtr; } if (ptr && *ptr) { - stats->dwRtoMin = strtoul(ptr, &endPtr, 10); + stats->dwRtoMax = strtoul(ptr, &endPtr, 10); ptr = endPtr; } if (ptr && *ptr) {

1 0

Eric Durbin : iphlpapi: Implement getICMPStats on FreeBSD.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 020b0ef64f95b4830b8d3a772ed701cd172a4a80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=020b0ef64f95b4830b8d3a772… Author: Eric Durbin <eadurbin(a)freebsd.org> Date: Tue Jun 24 22:45:51 2008 -0500 iphlpapi: Implement getICMPStats on FreeBSD. --- configure | 13 ++++++++- configure.ac | 10 ++++++- dlls/iphlpapi/ipstats.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 9 ++++++ 4 files changed, 99 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b9ef219..6dac855 100755 --- a/configure +++ b/configure @@ -7086,12 +7086,15 @@ done + + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ CoreAudio/CoreAudio.h \ DiskArbitration/DiskArbitration.h \ IOKit/IOKitLib.h \ + alias.h \ alsa/asoundlib.h \ arpa/inet.h \ arpa/nameser.h \ @@ -7135,6 +7138,7 @@ for ac_header in \ netdb.h \ netinet/in.h \ netinet/in_systm.h \ + netinet/ip_icmp.h \ netinet/tcp.h \ netinet/tcp_fsm.h \ netinet/udp.h \ @@ -7554,7 +7558,8 @@ done -for ac_header in netinet/tcp_var.h netinet/udp_var.h + +for ac_header in netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -7569,6 +7574,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <sys/types.h> + #ifdef HAVE_ALIAS_H + # include <alias.h> + #endif #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif @@ -7581,6 +7589,9 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_NETINET_IP_VAR_H # include <netinet/ip_var.h> #endif + #ifdef HAVE_NETINET_IP_ICMP_H + # include <netinet/ip_icmp.h> + #endif #ifdef HAVE_NETINET_UDP_H # include <netinet/udp.h> #endif diff --git a/configure.ac b/configure.ac index 482c6dd..eb04796 100644 --- a/configure.ac +++ b/configure.ac @@ -231,6 +231,7 @@ AC_CHECK_HEADERS(\ CoreAudio/CoreAudio.h \ DiskArbitration/DiskArbitration.h \ IOKit/IOKitLib.h \ + alias.h \ alsa/asoundlib.h \ arpa/inet.h \ arpa/nameser.h \ @@ -274,6 +275,7 @@ AC_CHECK_HEADERS(\ netdb.h \ netinet/in.h \ netinet/in_systm.h \ + netinet/ip_icmp.h \ netinet/tcp.h \ netinet/tcp_fsm.h \ netinet/udp.h \ @@ -360,8 +362,11 @@ AC_CHECK_HEADERS([netinet/in_pcb.h netinet/ip_var.h net/if.h net/if_arp.h net/if # include <netinet/in.h> #endif]) -AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h],,, +AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h],,, [#include <sys/types.h> + #ifdef HAVE_ALIAS_H + # include <alias.h> + #endif #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif @@ -374,6 +379,9 @@ AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h],,, #ifdef HAVE_NETINET_IP_VAR_H # include <netinet/ip_var.h> #endif + #ifdef HAVE_NETINET_IP_ICMP_H + # include <netinet/ip_icmp.h> + #endif #ifdef HAVE_NETINET_UDP_H # include <netinet/udp.h> #endif diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 4cc7b52..8d35c5f 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -28,6 +28,9 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> +#ifdef HAVE_ALIAS_H +#include <alias.h> +#endif #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif @@ -65,6 +68,12 @@ #ifdef HAVE_NETINET_TCP_VAR_H #include <netinet/tcp_var.h> #endif +#ifdef HAVE_NETINET_IP_ICMP_H +#include <netinet/ip_icmp.h> +#endif +#ifdef HAVE_NETINET_ICMP_VAR_H +#include <netinet/icmp_var.h> +#endif #ifdef HAVE_NETINET_IP_VAR_H #include <netinet/ip_var.h> #endif @@ -247,6 +256,65 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) DWORD getICMPStats(MIB_ICMP *stats) { +#if defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) + int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS}; +#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) + size_t needed; + struct icmpstat icmp_stat; + int i; + + if (!stats) + return ERROR_INVALID_PARAMETER; + + needed = sizeof(icmp_stat); + if(sysctl(mib, MIB_LEN, &icmp_stat, &needed, NULL, 0) == -1) + { + ERR ("failed to get icmpstat\n"); + return ERROR_NOT_SUPPORTED; + } + + + /*in stats */ + stats->stats.icmpInStats.dwMsgs = icmp_stat.icps_badcode + icmp_stat.icps_checksum + icmp_stat.icps_tooshort + icmp_stat.icps_badlen; + for(i = 0; i <= ICMP_MAXTYPE; i++) + stats->stats.icmpInStats.dwMsgs += icmp_stat.icps_inhist[i]; + + stats->stats.icmpInStats.dwErrors = icmp_stat.icps_badcode + icmp_stat.icps_tooshort + icmp_stat.icps_checksum + icmp_stat.icps_badlen; + + stats->stats.icmpInStats.dwDestUnreachs = icmp_stat.icps_inhist[ICMP_UNREACH]; + stats->stats.icmpInStats.dwTimeExcds = icmp_stat.icps_inhist[ICMP_TIMXCEED]; + stats->stats.icmpInStats.dwParmProbs = icmp_stat.icps_inhist[ICMP_PARAMPROB]; + stats->stats.icmpInStats.dwSrcQuenchs = icmp_stat.icps_inhist[ICMP_SOURCEQUENCH]; + stats->stats.icmpInStats.dwRedirects = icmp_stat.icps_inhist[ICMP_REDIRECT]; + stats->stats.icmpInStats.dwEchos = icmp_stat.icps_inhist[ICMP_ECHO]; + stats->stats.icmpInStats.dwEchoReps = icmp_stat.icps_inhist[ICMP_ECHOREPLY]; + stats->stats.icmpInStats.dwTimestamps = icmp_stat.icps_inhist[ICMP_TSTAMP]; + stats->stats.icmpInStats.dwTimestampReps = icmp_stat.icps_inhist[ICMP_TSTAMPREPLY]; + stats->stats.icmpInStats.dwAddrMasks = icmp_stat.icps_inhist[ICMP_MASKREQ]; + stats->stats.icmpInStats.dwAddrMaskReps = icmp_stat.icps_inhist[ICMP_MASKREPLY]; + + + /* out stats */ + stats->stats.icmpOutStats.dwMsgs = icmp_stat.icps_oldshort + icmp_stat.icps_oldicmp; + for(i = 0; i <= ICMP_MAXTYPE; i++) + stats->stats.icmpOutStats.dwMsgs += icmp_stat.icps_outhist[i]; + + stats->stats.icmpOutStats.dwErrors = icmp_stat.icps_oldshort + icmp_stat.icps_oldicmp; + + stats->stats.icmpOutStats.dwDestUnreachs = icmp_stat.icps_outhist[ICMP_UNREACH]; + stats->stats.icmpOutStats.dwTimeExcds = icmp_stat.icps_outhist[ICMP_TIMXCEED]; + stats->stats.icmpOutStats.dwParmProbs = icmp_stat.icps_outhist[ICMP_PARAMPROB]; + stats->stats.icmpOutStats.dwSrcQuenchs = icmp_stat.icps_outhist[ICMP_SOURCEQUENCH]; + stats->stats.icmpOutStats.dwRedirects = icmp_stat.icps_outhist[ICMP_REDIRECT]; + stats->stats.icmpOutStats.dwEchos = icmp_stat.icps_outhist[ICMP_ECHO]; + stats->stats.icmpOutStats.dwEchoReps = icmp_stat.icps_outhist[ICMP_ECHOREPLY]; + stats->stats.icmpOutStats.dwTimestamps = icmp_stat.icps_outhist[ICMP_TSTAMP]; + stats->stats.icmpOutStats.dwTimestampReps = icmp_stat.icps_outhist[ICMP_TSTAMPREPLY]; + stats->stats.icmpOutStats.dwAddrMasks = icmp_stat.icps_outhist[ICMP_MASKREQ]; + stats->stats.icmpOutStats.dwAddrMaskReps = icmp_stat.icps_outhist[ICMP_MASKREPLY]; + + return NO_ERROR; +#else FILE *fp; if (!stats) @@ -376,6 +444,7 @@ DWORD getICMPStats(MIB_ICMP *stats) } return NO_ERROR; +#endif } DWORD getIPStats(PMIB_IPSTATS stats) diff --git a/include/config.h.in b/include/config.h.in index f9d27ae..9bef3c3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -5,6 +5,9 @@ /* Specifies the compiler flag that forces a short wchar_t */ #undef CC_FLAG_SHORT_WCHAR +/* Define to 1 if you have the <alias.h> header file. */ +#undef HAVE_ALIAS_H + /* Define if you have ALSA 1.x including devel headers */ #undef HAVE_ALSA @@ -435,6 +438,9 @@ /* Define to 1 if you have the <netdb.h> header file. */ #undef HAVE_NETDB_H +/* Define to 1 if you have the <netinet/icmp_var.h> header file. */ +#undef HAVE_NETINET_ICMP_VAR_H + /* Define to 1 if you have the <netinet/in.h> header file. */ #undef HAVE_NETINET_IN_H @@ -444,6 +450,9 @@ /* Define to 1 if you have the <netinet/in_systm.h> header file. */ #undef HAVE_NETINET_IN_SYSTM_H +/* Define to 1 if you have the <netinet/ip_icmp.h> header file. */ +#undef HAVE_NETINET_IP_ICMP_H + /* Define to 1 if you have the <netinet/ip_var.h> header file. */ #undef HAVE_NETINET_IP_VAR_H

1 0

Eric Durbin : iphlpapi: Downgrade some ERR messages to WARN.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 9d4c42a5b759c21cbd24f64a5c0d6daeea08459a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4c42a5b759c21cbd24f64a5… Author: Eric Durbin <eadurbin(a)freebsd.org> Date: Tue Jun 24 22:45:01 2008 -0500 iphlpapi: Downgrade some ERR messages to WARN. --- dlls/iphlpapi/ipstats.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index c9b9565..4cc7b52 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -995,7 +995,7 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE *ppIpForwardTable, HANDLE heap, addr = 0; else if (sa->sa_family != AF_INET) { - ERR ("Received unsupported sockaddr family 0x%x\n", + WARN ("Received unsupported sockaddr family 0x%x\n", sa->sa_family); addr = 0; } @@ -1021,7 +1021,7 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE *ppIpForwardTable, HANDLE heap, break; default: - ERR ("Unexpected address type 0x%x\n", i); + WARN ("Unexpected address type 0x%x\n", i); } }

1 0

Eric Durbin : iphlpapi: Implement getUDPStats on FreeBSD.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 6d4eab9ab44100f13c4ca5802f579a28a5055a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4eab9ab44100f13c4ca5802… Author: Eric Durbin <eadurbin(a)freebsd.org> Date: Tue Jun 24 22:44:13 2008 -0500 iphlpapi: Implement getUDPStats on FreeBSD. --- configure | 11 ++++++++++- configure.ac | 9 ++++++++- dlls/iphlpapi/ipstats.c | 31 +++++++++++++++++++++++++++++++ include/config.h.in | 6 ++++++ 4 files changed, 55 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e855076..b9ef219 100755 --- a/configure +++ b/configure @@ -7085,6 +7085,7 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -7136,6 +7137,7 @@ for ac_header in \ netinet/in_systm.h \ netinet/tcp.h \ netinet/tcp_fsm.h \ + netinet/udp.h \ openssl/err.h \ openssl/ssl.h \ png.h \ @@ -7551,7 +7553,8 @@ done -for ac_header in netinet/tcp_var.h + +for ac_header in netinet/tcp_var.h netinet/udp_var.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -7575,6 +7578,12 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif + #ifdef HAVE_NETINET_IP_VAR_H + # include <netinet/ip_var.h> + #endif + #ifdef HAVE_NETINET_UDP_H + # include <netinet/udp.h> + #endif #ifdef HAVE_NETINET_TCP_H # include <netinet/tcp.h> #endif diff --git a/configure.ac b/configure.ac index 77287de..482c6dd 100644 --- a/configure.ac +++ b/configure.ac @@ -276,6 +276,7 @@ AC_CHECK_HEADERS(\ netinet/in_systm.h \ netinet/tcp.h \ netinet/tcp_fsm.h \ + netinet/udp.h \ openssl/err.h \ openssl/ssl.h \ png.h \ @@ -359,7 +360,7 @@ AC_CHECK_HEADERS([netinet/in_pcb.h netinet/ip_var.h net/if.h net/if_arp.h net/if # include <netinet/in.h> #endif]) -AC_CHECK_HEADERS([netinet/tcp_var.h],,, +AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h],,, [#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> @@ -370,6 +371,12 @@ AC_CHECK_HEADERS([netinet/tcp_var.h],,, #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif + #ifdef HAVE_NETINET_IP_VAR_H + # include <netinet/ip_var.h> + #endif + #ifdef HAVE_NETINET_UDP_H + # include <netinet/udp.h> + #endif #ifdef HAVE_NETINET_TCP_H # include <netinet/tcp.h> #endif]) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index fa2826d..772006b 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -68,6 +68,12 @@ #ifdef HAVE_NETINET_IP_VAR_H #include <netinet/ip_var.h> #endif +#ifdef HAVE_NETINET_UDP_H +#include <netinet/udp.h> +#endif +#ifdef HAVE_NETINET_UDP_VAR_H +#include <netinet/udp_var.h> +#endif #ifdef HAVE_SYS_SYSCTL_H #include <sys/sysctl.h> @@ -587,6 +593,30 @@ DWORD getTCPStats(MIB_TCPSTATS *stats) DWORD getUDPStats(MIB_UDPSTATS *stats) { +#if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) + int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS}; +#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) + struct udpstat udp_stat; + size_t needed; + if (!stats) + return ERROR_INVALID_PARAMETER; + + needed = sizeof(udp_stat); + + if(sysctl(mib, MIB_LEN, &udp_stat, &needed, NULL, 0) == -1) + { + ERR ("failed to get udpstat\n"); + return ERROR_NOT_SUPPORTED; + } + + stats->dwInDatagrams = udp_stat.udps_ipackets; + stats->dwOutDatagrams = udp_stat.udps_opackets; + stats->dwNoPorts = udp_stat.udps_noport; + stats->dwInErrors = udp_stat.udps_hdrops + udp_stat.udps_badsum + udp_stat.udps_fullsock + udp_stat.udps_badlen; + stats->dwNumAddrs = getNumUdpEntries(); + + return NO_ERROR; +#else FILE *fp; if (!stats) @@ -642,6 +672,7 @@ DWORD getUDPStats(MIB_UDPSTATS *stats) } return NO_ERROR; +#endif } static DWORD getNumWithOneHeader(const char *filename) diff --git a/include/config.h.in b/include/config.h.in index 9833b23..f9d27ae 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -456,6 +456,12 @@ /* Define to 1 if you have the <netinet/tcp_var.h> header file. */ #undef HAVE_NETINET_TCP_VAR_H +/* Define to 1 if you have the <netinet/udp.h> header file. */ +#undef HAVE_NETINET_UDP_H + +/* Define to 1 if you have the <netinet/udp_var.h> header file. */ +#undef HAVE_NETINET_UDP_VAR_H + /* Define to 1 if you have the <netipx/ipx.h> header file. */ #undef HAVE_NETIPX_IPX_H

1 0

Eric Durbin : iphlpapi: Implement getIPStats on FreeBSD.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: a00e693f37d4a908d8812521de63ca3ee76059db URL: http://source.winehq.org/git/wine.git/?a=commit;h=a00e693f37d4a908d8812521d… Author: Eric Durbin <eadurbin(a)freebsd.org> Date: Tue Jun 24 22:44:41 2008 -0500 iphlpapi: Implement getIPStats on FreeBSD. --- dlls/iphlpapi/ipstats.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 772006b..c9b9565 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -380,6 +380,57 @@ DWORD getICMPStats(MIB_ICMP *stats) DWORD getIPStats(PMIB_IPSTATS stats) { +#if defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) + int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS}; +#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) + int ip_ttl, ip_forwarding; + struct ipstat ip_stat; + size_t needed; + + if (!stats) + return ERROR_INVALID_PARAMETER; + + needed = sizeof(ip_stat); + if(sysctl(mib, MIB_LEN, &ip_stat, &needed, NULL, 0) == -1) + { + ERR ("failed to get ipstat\n"); + return ERROR_NOT_SUPPORTED; + } + + needed = sizeof(ip_ttl); + if (sysctlbyname ("net.inet.ip.ttl", &ip_ttl, &needed, NULL, 0) == -1) + { + ERR ("failed to get ip Default TTL\n"); + return ERROR_NOT_SUPPORTED; + } + + needed = sizeof(ip_forwarding); + if (sysctlbyname ("net.inet.ip.forwarding", &ip_forwarding, &needed, NULL, 0) == -1) + { + ERR ("failed to get ip forwarding\n"); + return ERROR_NOT_SUPPORTED; + } + + stats->dwForwarding = ip_forwarding; + stats->dwDefaultTTL = ip_ttl; + stats->dwInDelivers = ip_stat.ips_delivered; + stats->dwInHdrErrors = ip_stat.ips_badhlen + ip_stat.ips_badsum + ip_stat.ips_tooshort + ip_stat.ips_badlen; + stats->dwInAddrErrors = ip_stat.ips_cantforward; + stats->dwInReceives = ip_stat.ips_total; + stats->dwForwDatagrams = ip_stat.ips_forward; + stats->dwInUnknownProtos = ip_stat.ips_noproto; + stats->dwInDiscards = ip_stat.ips_fragdropped; + stats->dwOutDiscards = ip_stat.ips_odropped; + stats->dwReasmOks = ip_stat.ips_reassembled; + stats->dwFragOks = ip_stat.ips_fragmented; + stats->dwFragFails = ip_stat.ips_cantfrag; + stats->dwReasmTimeout = ip_stat.ips_fragtimeout; + stats->dwOutNoRoutes = ip_stat.ips_noroute; + stats->dwOutRequests = ip_stat.ips_localout; + stats->dwReasmReqds = ip_stat.ips_fragments; + + return NO_ERROR; +#else FILE *fp; if (!stats) @@ -493,6 +544,7 @@ DWORD getIPStats(PMIB_IPSTATS stats) } return NO_ERROR; +#endif } DWORD getTCPStats(MIB_TCPSTATS *stats)

1 0

Eric Durbin : iphlpapi: Implement getNumUdpEntries on FreeBSD.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 9a974dea63c9c5aed21d745b069612921f9784db URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a974dea63c9c5aed21d745b0… Author: Eric Durbin <eadurbin(a)freebsd.org> Date: Tue Jun 24 22:43:21 2008 -0500 iphlpapi: Implement getNumUdpEntries on FreeBSD. --- dlls/iphlpapi/ipstats.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 3a537b1..fa2826d 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1145,7 +1145,11 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpNetTable, HANDLE heap, DWORD flags) DWORD getNumUdpEntries(void) { +#if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_NETINET_IN_PCB_H) + return getNumWithOneHeader ("net.inet.udp.pcblist"); +#else return getNumWithOneHeader("/proc/net/udp"); +#endif } DWORD getUdpTable(PMIB_UDPTABLE *ppUdpTable, HANDLE heap, DWORD flags)

1 0