content/common/p2p_messages.h - Issue 536133003: MergeNetworkList can't group address under the same interface

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/common/p2p_messages.h

Issue 536133003: MergeNetworkList can't group address under the same interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix one more comment Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « no previous file | content/content_tests.gypi » ('j') | content/renderer/p2p/ipc_network_manager.h » ('J')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 // IPC messages for the P2P Transport API.	5 // IPC messages for the P2P Transport API.

6 // Multiply-included message file, hence no include guard.	6 // Multiply-included message file, hence no include guard.

7	7

8 #include "base/time/time.h"	8 #include "base/time/time.h"

9 #include "content/common/content_export.h"	9 #include "content/common/content_export.h"

10 #include "content/common/p2p_socket_type.h"	10 #include "content/common/p2p_socket_type.h"

(...skipping 10 matching lines...) Expand all Loading...
21 IPC_ENUM_TRAITS_MAX_VALUE(content::P2PSocketOption,	21 IPC_ENUM_TRAITS_MAX_VALUE(content::P2PSocketOption,

22 content::P2P_SOCKET_OPT_MAX - 1)	22 content::P2P_SOCKET_OPT_MAX - 1)

23 IPC_ENUM_TRAITS_MIN_MAX_VALUE(rtc::DiffServCodePoint,	23 IPC_ENUM_TRAITS_MIN_MAX_VALUE(rtc::DiffServCodePoint,

24 rtc::DSCP_NO_CHANGE,	24 rtc::DSCP_NO_CHANGE,

25 rtc::DSCP_CS7)	25 rtc::DSCP_CS7)

26	26

27 IPC_STRUCT_TRAITS_BEGIN(net::NetworkInterface)	27 IPC_STRUCT_TRAITS_BEGIN(net::NetworkInterface)

28 IPC_STRUCT_TRAITS_MEMBER(name)	28 IPC_STRUCT_TRAITS_MEMBER(name)

29 IPC_STRUCT_TRAITS_MEMBER(type)	29 IPC_STRUCT_TRAITS_MEMBER(type)

30 IPC_STRUCT_TRAITS_MEMBER(address)	30 IPC_STRUCT_TRAITS_MEMBER(address)

	31 IPC_STRUCT_TRAITS_MEMBER(network_prefix)

31 IPC_STRUCT_TRAITS_END()	32 IPC_STRUCT_TRAITS_END()

32	33

33 IPC_STRUCT_TRAITS_BEGIN(rtc::PacketTimeUpdateParams)	34 IPC_STRUCT_TRAITS_BEGIN(rtc::PacketTimeUpdateParams)

34 IPC_STRUCT_TRAITS_MEMBER(rtp_sendtime_extension_id)	35 IPC_STRUCT_TRAITS_MEMBER(rtp_sendtime_extension_id)

35 IPC_STRUCT_TRAITS_MEMBER(srtp_auth_key)	36 IPC_STRUCT_TRAITS_MEMBER(srtp_auth_key)

36 IPC_STRUCT_TRAITS_MEMBER(srtp_auth_tag_len)	37 IPC_STRUCT_TRAITS_MEMBER(srtp_auth_tag_len)

37 IPC_STRUCT_TRAITS_MEMBER(srtp_packet_index)	38 IPC_STRUCT_TRAITS_MEMBER(srtp_packet_index)

38 IPC_STRUCT_TRAITS_END()	39 IPC_STRUCT_TRAITS_END()

39	40

40 IPC_STRUCT_TRAITS_BEGIN(rtc::PacketOptions)	41 IPC_STRUCT_TRAITS_BEGIN(rtc::PacketOptions)

(...skipping 66 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
107 rtc::PacketOptions /* packet options */,	108 rtc::PacketOptions /* packet options */,

108 uint64 /* packet_id */)	109 uint64 /* packet_id */)

109	110

110 IPC_MESSAGE_CONTROL1(P2PHostMsg_DestroySocket,	111 IPC_MESSAGE_CONTROL1(P2PHostMsg_DestroySocket,

111 int /* socket_id */)	112 int /* socket_id */)

112	113

113 IPC_MESSAGE_CONTROL3(P2PHostMsg_SetOption,	114 IPC_MESSAGE_CONTROL3(P2PHostMsg_SetOption,

114 int /* socket_id */,	115 int /* socket_id */,

115 content::P2PSocketOption /* socket option type */,	116 content::P2PSocketOption /* socket option type */,

116 int /* value */)	117 int /* value */)

OLD	NEW