100c100 < if ( MCH_DBG( mchStat[inst] ) ) --- > // if ( MCH_DBG( mchStat[inst] ) ) 121c121 < if ( MCH_DBG( mchStat[inst] ) >= MCH_DBG_MED ) --- > // if ( MCH_DBG( mchStat[inst] ) >= MCH_DBG_MED ) 132c132 < if ( MCH_DBG( mchStat[inst] ) ) --- > // if ( MCH_DBG( mchStat[inst] ) ) 178a179,188 > > > /* > case MCH_TYPE_NAT: > *offs = IPMI_RPLY_BRIDGED_1REPLY_OFFSET; > *responseSize += *offs; > *bridged = 1; > *rsAddr = IPMI_MSG_ADDR_CM; > *rqAddr = IPMI_MSG_ADDR_BMC; > */ 185c195 < printf("mchMsgCheckSizes: message size %i less than zero\n", (int)srcSize); --- > printf("mchMsgCheckSizes: message size %i less than zero\n", srcSize); 189c199 < printf("mchMsgCheckSizes: copy size %i larger than destination %i \n", offset+(int)srcSize, (int)destSize); --- > printf("mchMsgCheckSizes: copy size %i larger than destination %i \n", offset+srcSize, destSize); 243a254,255 > //printf("mchMsgGetSess: roffs %i responseSize %i payloadSize %i\n", roffs, responseSize, payloadSize); > 358a371,399 > /* Broadcast Get Device ID -- this is called before we know device type -- need to update this > * > * RETURNS: status from mchMsgWriteReadHelper > * 0 on success > * non-zero for error > */ > int > mchMsgBroadcastGetDeviceId(MchData mchData, uint8_t *data, int tmp, uint8_t tmp1 ) //int bridged, uint8_t rsAddr) // change this to either never be bridged or to implement device checking and offsets; handle rqAddr too > { > uint8_t response[MSG_MAX_LENGTH] = { 0 }; > size_t roffs, responseSize = 0, payloadSize = IPMI_RPLY_IMSG2_GET_DEVICE_ID_LENGTH; > int rval, bridged; > uint8_t rsAddr, rqAddr; > > mchSetSizeOffs( mchData->ipmiSess, payloadSize, &roffs, &responseSize, &bridged, &rsAddr, &rqAddr); > > if ( (rval = ipmiMsgBroadcastGetDeviceId( mchData->mchSess, mchData->ipmiSess, response, bridged, rsAddr, rqAddr, &responseSize, roffs )) ) > goto bail; > > if ( (rval = mchMsgCheckSizes( sizeof( response ), roffs, payloadSize )) ) { > printf("mchMsgBroadcastGetDeviceId size error\n"); > goto bail; > } > memcpy( data, response + roffs, payloadSize ); > > bail: > return rval; > } > 513c554 < printf("mchMsgGetSdrRepInfo size error roffs %i payloadSize %i responseSize %i\n", (int)roffs, (int)payloadSize, (int)responseSize); --- > printf("mchMsgGetSdrRepInfo size error roffs %i payloadSize %i responseSize %i\n", roffs, payloadSize, responseSize); 937c978 < int bridged; --- > int rval, bridged; 989c1030 < int rval, offs=0, bridged; --- > int rval, offs, bridged; 1104c1145 < int rval, offs=0, bridged; --- > int rval, offs, bridged; 1254c1295 < int rval, offs=0, bridged; --- > int rval, offs, bridged; 1366c1407 < int rval, offs=0, bridged; --- > int rval, offs, bridged;