Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
0fb70c6d
Commit
0fb70c6d
authored
16 years ago
by
Juan Lang
Committed by
Alexandre Julliard
16 years ago
Browse files
Options
Downloads
Patches
Plain Diff
inetmib1: Use a helper function to set the Oid with an item.
parent
81b0db24
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/inetmib1/main.c
+19
-31
19 additions, 31 deletions
dlls/inetmib1/main.c
with
19 additions
and
31 deletions
dlls/inetmib1/main.c
+
19
−
31
View file @
0fb70c6d
...
...
@@ -431,11 +431,10 @@ static AsnInteger32 getItemAndIpAddressInstanceFromOid(AsnObjectIdentifier *oid,
return
ret
;
}
static
void
setOidWithItem
AndIpAddr
(
AsnObjectIdentifier
*
dst
,
AsnObjectIdentifier
*
base
,
UINT
item
,
DWORD
addr
)
static
void
setOidWithItem
(
AsnObjectIdentifier
*
dst
,
AsnObjectIdentifier
*
base
,
UINT
item
)
{
UINT
id
;
BYTE
*
ptr
;
AsnObjectIdentifier
oid
;
SnmpUtilOidCpy
(
dst
,
base
);
...
...
@@ -443,6 +442,18 @@ static void setOidWithItemAndIpAddr(AsnObjectIdentifier *dst,
oid
.
ids
=
&
id
;
id
=
item
;
SnmpUtilOidAppend
(
dst
,
&
oid
);
}
static
void
setOidWithItemAndIpAddr
(
AsnObjectIdentifier
*
dst
,
AsnObjectIdentifier
*
base
,
UINT
item
,
DWORD
addr
)
{
UINT
id
;
BYTE
*
ptr
;
AsnObjectIdentifier
oid
;
setOidWithItem
(
dst
,
base
,
item
);
oid
.
idLength
=
1
;
oid
.
ids
=
&
id
;
for
(
ptr
=
(
BYTE
*
)
&
addr
;
ptr
<
(
BYTE
*
)
&
addr
+
sizeof
(
DWORD
);
ptr
++
)
{
id
=
*
ptr
;
...
...
@@ -455,10 +466,8 @@ static void setOidWithItemAndInteger(AsnObjectIdentifier *dst,
{
AsnObjectIdentifier
oid
;
SnmpUtilOidCpy
(
dst
,
base
);
setOidWithItem
(
dst
,
base
,
item
);
oid
.
idLength
=
1
;
oid
.
ids
=
&
item
;
SnmpUtilOidAppend
(
dst
,
&
oid
);
oid
.
ids
=
&
instance
;
SnmpUtilOidAppend
(
dst
,
&
oid
);
}
...
...
@@ -597,14 +606,7 @@ static BOOL mib2IpStatsQuery(BYTE bPduType, SnmpVarBind *pVarBind,
*
pErrorStatus
=
mapStructEntryToValue
(
mib2IpMap
,
DEFINE_SIZEOF
(
mib2IpMap
),
&
ipStats
,
item
,
bPduType
,
pVarBind
);
if
(
!*
pErrorStatus
&&
bPduType
==
SNMP_PDU_GETNEXT
)
{
AsnObjectIdentifier
oid
;
SnmpUtilOidCpy
(
&
pVarBind
->
name
,
&
myOid
);
oid
.
idLength
=
1
;
oid
.
ids
=
&
item
;
SnmpUtilOidAppend
(
&
pVarBind
->
name
,
&
oid
);
}
setOidWithItem
(
&
pVarBind
->
name
,
&
myOid
,
item
);
}
break
;
case
SNMP_PDU_SET
:
...
...
@@ -875,15 +877,8 @@ static BOOL mib2IcmpQuery(BYTE bPduType, SnmpVarBind *pVarBind,
*
pErrorStatus
=
mapStructEntryToValue
(
mib2IcmpMap
,
DEFINE_SIZEOF
(
mib2IcmpMap
),
&
icmpStats
,
item
,
bPduType
,
pVarBind
);
if
(
!*
pErrorStatus
)
{
AsnObjectIdentifier
oid
;
SnmpUtilOidCpy
(
&
pVarBind
->
name
,
&
myOid
);
oid
.
idLength
=
1
;
oid
.
ids
=
&
item
;
SnmpUtilOidAppend
(
&
pVarBind
->
name
,
&
oid
);
}
if
(
!*
pErrorStatus
&&
bPduType
==
SNMP_PDU_GETNEXT
)
setOidWithItem
(
&
pVarBind
->
name
,
&
myOid
,
item
);
}
break
;
case
SNMP_PDU_SET
:
...
...
@@ -942,14 +937,7 @@ static BOOL mib2TcpQuery(BYTE bPduType, SnmpVarBind *pVarBind,
*
pErrorStatus
=
mapStructEntryToValue
(
mib2TcpMap
,
DEFINE_SIZEOF
(
mib2TcpMap
),
&
tcpStats
,
item
,
bPduType
,
pVarBind
);
if
(
!*
pErrorStatus
&&
bPduType
==
SNMP_PDU_GETNEXT
)
{
AsnObjectIdentifier
oid
;
SnmpUtilOidCpy
(
&
pVarBind
->
name
,
&
myOid
);
oid
.
idLength
=
1
;
oid
.
ids
=
&
item
;
SnmpUtilOidAppend
(
&
pVarBind
->
name
,
&
oid
);
}
setOidWithItem
(
&
pVarBind
->
name
,
&
myOid
,
item
);
}
break
;
case
SNMP_PDU_SET
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment