Add ufrag to the ICE candidate signaling.

talk/app/webrtc/webrtcsdp.cc

 /*
  * libjingle
  * Copyright 2011 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 1067 matching lines @@
   std::string username;
   std::string password;
   uint32_t generation = 0;
   for (size_t i = current_position; i + 1 < fields.size(); ++i) {
     // RFC 5245
     // *(SP extension-att-name SP extension-att-value)
     if (fields[i] == kAttributeCandidateGeneration) {
       if (!GetValueFromString(first_line, fields[++i], &generation, error)) {
         return false;
       }
     } else if (fields[i] == kAttributeCandidateUsername) {

[pthatcher1, 2015/12/04 20:43:49]

I think we should change this to check for kAttributeCandidateUsernameFragment

[honghaiz3, 2015/12/09 23:57:54]

Done.

       username = fields[++i];
     } else if (fields[i] == kAttributeCandidatePassword) {
       password = fields[++i];
     } else {
       // Skip the unknown extension.
       ++i;
     }
   }
 
   *candidate = Candidate(component_id, cricket::ProtoToString(protocol),
@@ skipping 652 matching lines @@
          << kAttributeCandidateRport << " "
          << it->related_address().PortAsString() << " ";
     }
 
     if (it->protocol() == cricket::TCP_PROTOCOL_NAME) {
       os << kTcpCandidateType << " " << it->tcptype() << " ";
     }
 
     // Extensions
     os << kAttributeCandidateGeneration << " " << it->generation();
+    if (!it->username().empty()) {
+      os << " " << kAttributeCandidateUsername << " " << it->username();

[pthatcher1, 2015/12/04 20:43:49]

This would make it "username", but it's not really a username.  It's a "username
fragment".  So we should probably make the string "ufrag".  Maybe call it
kAttributeCandidateUsernameFragment

[honghaiz3, 2015/12/09 23:57:54]

I just used the one kAttributeUfrag which is "ice-ufrag", so that it matches the
one in the offer/answer.

+    }
 
     AddLine(os.str(), message);
   }
 }
 
 void BuildIceOptions(const std::vector<std::string>& transport_options,
                      std::string* message) {
   if (!transport_options.empty()) {
     std::ostringstream os;
     InitAttrLine(kAttributeIceOption, &os);
@@ skipping 888 matching lines @@
     // Verify video codec ensures that no video codec has been populated with
     // only rtcp-fb.
     if (!VerifyVideoCodecs(video_desc)) {
       return ParseFailed("Failed to parse video codecs correctly.", error);
     }
   }
 
   // RFC 5245
   // Update the candidates with the media level "ice-pwd" and "ice-ufrag".
   for (Candidates::iterator it = candidates_orig.begin();
        it != candidates_orig.end(); ++it) {

[pthatcher1, 2015/12/04 20:43:49]

Since this is parsing candidates in the SDP (not trickled), shouldn't we assert
that it's empty or that it matches the value in the transport description?

[honghaiz3, 2015/12/09 23:57:54]

Yes. Thanks. 

-    ASSERT((*it).username().empty());
     (*it).set_username(transport->ice_ufrag);
     ASSERT((*it).password().empty());
     (*it).set_password(transport->ice_pwd);
     candidates->push_back(
         new JsepIceCandidate(mline_id, mline_index, *it));
   }
   return true;
 }
 
 bool ParseSsrcAttribute(const std::string& line, SsrcInfoVec* ssrc_infos,
@@ skipping 376 matching lines @@
     UpdateCodec<AudioContentDescription, cricket::AudioCodec>(
         media_desc, payload_type, feedback_param);
   } else if (media_type == cricket::MEDIA_TYPE_VIDEO) {
     UpdateCodec<VideoContentDescription, cricket::VideoCodec>(
         media_desc, payload_type, feedback_param);
   }
   return true;
 }
 
 }  // namespace webrtc