[server] / trunk / server / src / m3gdevice.h Repository:
ViewVC logotype

Diff of /trunk/server/src/m3gdevice.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 948, Fri Oct 15 11:35:37 2010 UTC revision 949, Fri Oct 15 11:36:45 2010 UTC
# Line 535  Line 535 
535   */   */
536  inline std::ostream& operator << ( std::ostream &os, const M3G_VENDORID_INFO& vendorIdInfo )  inline std::ostream& operator << ( std::ostream &os, const M3G_VENDORID_INFO& vendorIdInfo )
537  {  {
538          os << "version: 0x%" << std::hex << vendorIdInfo.version << std::dec << std::endl;          os << "M3G_VENDORID_INFO:" << std::endl;
539            os << "version: 0x" << std::hex << vendorIdInfo.version << std::dec << std::endl;
540          if ( vendorIdInfo.vendor.oidType == M3G_E_OID_TYPE )          if ( vendorIdInfo.vendor.oidType == M3G_E_OID_TYPE )
541          {          {
542                  os << "vendor:" << std::endl;                  int length = vendorIdInfo.vendor.oidValue.oid.length;
543                  os << "oid.length: " << vendorIdInfo.vendor.oidValue.oid.length << std::endl;                  os << "oid.objectId[" << std::dec << length << "] ";
544                  os << "oid.objectId[]: " << std::hex;                  for ( int n = 0; n < length; n++ )
545                  os << vendorIdInfo.vendor.oidValue.oid.objectId[0] << " ";                  {
546                  os << vendorIdInfo.vendor.oidValue.oid.objectId[1] << " ";                          os << vendorIdInfo.vendor.oidValue.oid.objectId[n];
547                  os << vendorIdInfo.vendor.oidValue.oid.objectId[2] << std::endl;                  }
548                    os << std::endl;
549          }          }
550          else if ( vendorIdInfo.vendor.oidType == M3G_E_H221_ID_TYPE )          else if ( vendorIdInfo.vendor.oidType == M3G_E_H221_ID_TYPE )
551          {          {
552                  os << "vendor:" << std::endl;                  os << "t35CountryCode: " << static_cast<int>(vendorIdInfo.vendor.oidValue.h221NonStd.t35CountryCode) << std::endl;
553                  os << "t35CountryCode: " << vendorIdInfo.vendor.oidValue.h221NonStd.t35CountryCode << std::endl;                  os << "t35Extension: " << static_cast<int>(vendorIdInfo.vendor.oidValue.h221NonStd.t35Extension) << std::endl;
554                  os << "t35Extension: " << vendorIdInfo.vendor.oidValue.h221NonStd.t35Extension << std::endl;                  os << "manufacturerCode: " << static_cast<int>(vendorIdInfo.vendor.oidValue.h221NonStd.manufacturerCode) << std::endl;
555                  os << "manufacturerCode: " << vendorIdInfo.vendor.oidValue.h221NonStd.manufacturerCode << std::endl;          }
556          }  
557          os << "productNumber[" << std::dec << vendorIdInfo.productNumber.length << "] " << std::hex;          int length = vendorIdInfo.productNumber.length;
558          os << vendorIdInfo.productNumber.octet[0] << " ";          os << "productNumber[" << std::dec << length << "] " << std::hex;
559          os << vendorIdInfo.productNumber.octet[1] << " ";          for ( int n = 0; n < length; n++ )
560          os << vendorIdInfo.productNumber.octet[2] << std::endl;          {
561                    os << vendorIdInfo.productNumber.octet[n];
562          os << "versionNumber[" << std::dec << vendorIdInfo.productNumber.length << "] " << std::hex;          }
563          os << vendorIdInfo.versionNumber.octet[0] << " ";          os << std::endl;
564          os << vendorIdInfo.versionNumber.octet[1] << " ";  
565          os << vendorIdInfo.versionNumber.octet[2] << std::endl;          length = vendorIdInfo.versionNumber.length;
566            os << "versionNumber[" << std::dec << length << "] " << std::hex;
567            for ( int n = 0; n < length; n++ )
568            {
569                    os << vendorIdInfo.versionNumber.octet[n];
570            }
571            os << std::endl;
572    
573          return os;          return os;
574  }  }
Legend:
Removed from v.948  
changed lines
  Added in v.949
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.8