Changeset 58340 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt
- Timestamp:
- Oct 20, 2015 1:58:41 PM (10 years ago)
- svn:sync-xref-src-repo-rev:
- 103540
- Location:
- trunk/src/VBox/HostDrivers/VBoxNetFlt
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h
r56293 r58340 382 382 * 383 383 * @param pThis The instance. 384 * @param fActive Whether to active (@c true) or deactive. 384 385 * 385 386 * @remarks Owns the lock for the out-bound trunk port. -
trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
r58254 r58340 771 771 * @param pBuf The sk_buff. 772 772 * @param pSG The SG. 773 * @param pvFrame The frame pointer, optional.774 773 * @param cSegs The number of segments allocated for the SG. 775 774 * This should match the number in the mbuf exactly! 776 775 * @param fSrc The source of the frame. 777 * @param pGso 776 * @param pGsoCtx Pointer to the GSO context if it's a GSO 778 777 * internal network frame. NULL if regular frame. 779 778 */ … … 846 845 847 846 /** 848 * Packet handler, 849 * 850 * @returns 0 or EJUSTRETURN. 851 * @param pThis The instance. 852 * @param pMBuf The mbuf. 853 * @param pvFrame The start of the frame, optional. 854 * @param fSrc Where the packet (allegedly) comes from, one INTNETTRUNKDIR_* value. 855 * @param eProtocol The protocol. 847 * Packet handler; not really documented - figure it out yourself. 848 * 849 * @returns 0 or EJUSTRETURN - this is probably copy & pastry and thus wrong. 856 850 */ 857 851 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) … … 1372 1366 1373 1367 /** 1374 * 1368 * I won't disclose what I do, figure it out yourself, including pThis referencing. 1369 * 1370 * @param pThis The net filter instance. 1375 1371 * @param pBuf The socket buffer. This is consumed by this function. 1376 1372 */ … … 1609 1605 * @returns VBox status code. 1610 1606 * @param pThis The instance. 1611 * @param fRediscovery If set we're doing a rediscovery attempt, so, don't 1612 * flood the release log. 1607 * @param pDev The device to attach to. 1613 1608 */ 1614 1609 static int vboxNetFltLinuxAttachToInterface(PVBOXNETFLTINS pThis, struct net_device *pDev) -
trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c
r57358 r58340 124 124 * Stream Driver hooks. 125 125 */ 126 static int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pArg, void **pp Result);126 static int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pArg, void **ppvResult); 127 127 static int VBoxNetFltSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t enmCmd); 128 128 static int VBoxNetFltSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t enmCmd); … … 718 718 * @returns corresponding solaris error code. 719 719 */ 720 static int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pvArg, void **pp Result)720 static int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pvArg, void **ppvResult) 721 721 { 722 722 LogFunc((DEVICE_NAME ":VBoxNetFltSolarisGetInfo pDip=%p enmCmd=%d pArg=%p instance=%d\n", pDip, enmCmd, … … 727 727 case DDI_INFO_DEVT2DEVINFO: 728 728 { 729 *pp Result = g_pVBoxNetFltSolarisDip;729 *ppvResult = g_pVBoxNetFltSolarisDip; 730 730 return DDI_SUCCESS; 731 731 } … … 734 734 { 735 735 int instance = getminor((dev_t)pvArg); 736 *pp Result = (void *)(uintptr_t)instance;736 *ppvResult = (void *)(uintptr_t)instance; 737 737 return DDI_SUCCESS; 738 738 } … … 1318 1318 * 1319 1319 * @returns VBox status code. 1320 * @param p QueuePointer to the read queue.1320 * @param pPromiscStream Pointer to the read queue. 1321 1321 */ 1322 1322 static int vboxNetFltSolarisSetRawMode(vboxnetflt_promisc_stream_t *pPromiscStream) … … 1822 1822 * 1823 1823 * @returns VBox status code. 1824 * @param pVNode Pointer to the device vnode. 1824 1825 * @param MuxId The multiplexor ID. 1825 1826 * @param pFd Where to store the lower stream file descriptor. … … 1909 1910 * 1910 1911 * @returns VBox status code. 1912 * @param fAttach Is this an attach or detach. 1911 1913 * @param pVNode Pointer to the lower stream vnode. 1912 1914 * @param pModPos Where to store the module position. … … 2645 2647 * Ipv6 dynamic attachment timer callback to attach to the Ipv6 stream if needed. 2646 2648 * 2647 * @param pT hisPointer to the timer.2649 * @param pTimer Pointer to the timer. 2648 2650 * @param pvData Opaque pointer to the instance. 2649 2651 * @param iTick Timer tick (unused). … … 2851 2853 * @param pThis The instance. 2852 2854 * @param pSG Pointer to the scatter-gather list. 2855 * @param fDst The destination mask, INTNETTRUNKDIR_XXX. Ignored. 2853 2856 */ 2854 2857 static mblk_t *vboxNetFltSolarisMBlkFromSG(PVBOXNETFLTINS pThis, PINTNETSG pSG, uint32_t fDst) … … 2967 2970 * @returns VBox status code. 2968 2971 * @param pMsg Pointer to the raw message. 2969 * @param p DlpiMsgWhere to store the M_PROTO message.2972 * @param ppDlpiMsg Where to store the M_PROTO message. 2970 2973 * 2971 2974 * @remarks The original raw message would be no longer valid and will be … … 3370 3373 * @param pStream Pointer to the stream. 3371 3374 * @param pQueue Pointer to the read queue. 3372 * @param p OrigMsgPointer to the message.3375 * @param pMsg Pointer to the message. 3373 3376 */ 3374 3377 static int vboxNetFltSolarisRecv(PVBOXNETFLTINS pThis, vboxnetflt_stream_t *pStream, queue_t *pQueue, mblk_t *pMsg) -
trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c
r57867 r58340 121 121 LOCAL int VBoxNetFltSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t enmCmd); 122 122 LOCAL int VBoxNetFltSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t enmCmd); 123 LOCAL int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pArg, void **pp Result);123 LOCAL int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pArg, void **ppvResult); 124 124 125 125 … … 425 425 * @returns corresponding solaris error code. 426 426 */ 427 LOCAL int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pvArg, void **pp Result)427 LOCAL int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pvArg, void **ppvResult) 428 428 { 429 429 Log((DEVICE_NAME ":VBoxNetFltSolarisGetInfo pDip=%p enmCmd=%d pArg=%p instance=%d\n", pDip, enmCmd, getminor((dev_t)pvArg))); … … 433 433 case DDI_INFO_DEVT2DEVINFO: 434 434 { 435 *pp Result = g_pVBoxNetFltSolarisDip;435 *ppvResult = g_pVBoxNetFltSolarisDip; 436 436 return DDI_SUCCESS; 437 437 } … … 440 440 { 441 441 int instance = getminor((dev_t)pvArg); 442 *pp Result = (void *)(uintptr_t)instance;442 *ppvResult = (void *)(uintptr_t)instance; 443 443 return DDI_SUCCESS; 444 444 } … … 812 812 * @param pThis The instance. 813 813 * @param pVNIC Pointer to the VNIC. 814 * @param pVNICTemplate Pointer to the VNIC template initialize from, can be815 * NULL.816 814 * 817 815 * @returns VBox status code.
Note:
See TracChangeset
for help on using the changeset viewer.