| Index: talk/media/base/turnutils.h
|
| diff --git a/talk/media/devices/deviceinfo.h b/talk/media/base/turnutils.h
|
| similarity index 75%
|
| copy from talk/media/devices/deviceinfo.h
|
| copy to talk/media/base/turnutils.h
|
| index 86382f61458bcb8f119c8e00c3a51a8db2f9bcb2..47fcebef6eadd198dfdf0f6fb7d635d913ff6516 100644
|
| --- a/talk/media/devices/deviceinfo.h
|
| +++ b/talk/media/base/turnutils.h
|
| @@ -1,6 +1,6 @@
|
| /*
|
| * libjingle
|
| - * Copyright 2012 Google Inc.
|
| + * Copyright 2016 Google Inc.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions are met:
|
| @@ -25,18 +25,23 @@
|
| * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef TALK_MEDIA_DEVICES_DEVICEINFO_H_
|
| -#define TALK_MEDIA_DEVICES_DEVICEINFO_H_
|
| +#ifndef TALK_MEDIA_BASE_TURNUTILS_H_
|
| +#define TALK_MEDIA_BASE_TURNUTILS_H_
|
|
|
| -#include <string>
|
| -
|
| -#include "talk/media/devices/devicemanager.h"
|
| +#include <cstddef>
|
| +#include <cstdint>
|
|
|
| namespace cricket {
|
|
|
| -bool GetUsbId(const Device& device, std::string* usb_id);
|
| -bool GetUsbVersion(const Device& device, std::string* usb_version);
|
| +struct PacketOptions;
|
| +
|
| +// Finds data location within a TURN Channel Message or TURN Send Indication
|
| +// message.
|
| +bool UnwrapTurnPacket(const uint8_t* packet,
|
| + size_t packet_size,
|
| + size_t* content_position,
|
| + size_t* content_size);
|
|
|
| } // namespace cricket
|
|
|
| -#endif // TALK_MEDIA_DEVICES_DEVICEINFO_H_
|
| +#endif // TALK_MEDIA_BASE_TURNUTILS_H_
|
|
|