Commit 58ff9205 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

meep-wais subscriptions package integration fixes

parent 42fc7722
Loading
Loading
Loading
Loading
+63 −0
Original line number Diff line number Diff line
@@ -98,3 +98,66 @@ func convertJsonToMeasurementReportSubscription(jsonData string) *MeasurementRep
	}
	return &obj
}

func convertSubscriptionLinkListToJson(obj *SubscriptionLinkList) string {
	jsonInfo, err := json.Marshal(*obj)
	if err != nil {
		log.Error(err.Error())
		return ""
	}
	return string(jsonInfo)
}

func convertAssocStaNotificationToJson(obj *AssocStaNotification) string {
	jsonInfo, err := json.Marshal(*obj)
	if err != nil {
		log.Error(err.Error())
		return ""
	}
	return string(jsonInfo)
}

func convertStaDataRateNotificationToJson(obj *StaDataRateNotification) string {
	jsonInfo, err := json.Marshal(*obj)
	if err != nil {
		log.Error(err.Error())
		return ""
	}
	return string(jsonInfo)
}

func convertExpiryNotificationToJson(obj *ExpiryNotification) string {
	jsonInfo, err := json.Marshal(*obj)
	if err != nil {
		log.Error(err.Error())
		return ""
	}
	return string(jsonInfo)
}

func convertTestNotificationToJson(obj *TestNotification) string {
	jsonInfo, err := json.Marshal(*obj)
	if err != nil {
		log.Error(err.Error())
		return ""
	}
	return string(jsonInfo)
}

func convertApInfoListToJson(obj *[]ApInfo) string {
	jsonInfo, err := json.Marshal(*obj)
	if err != nil {
		log.Error(err.Error())
		return ""
	}
	return string(jsonInfo)
}

func convertStaInfoListToJson(obj *[]StaInfo) string {
	jsonInfo, err := json.Marshal(*obj)
	if err != nil {
		log.Error(err.Error())
		return ""
	}
	return string(jsonInfo)
}
+166 −237

File changed.

Preview size limit exceeded, changes collapsed.

+134 −53

File changed.

Preview size limit exceeded, changes collapsed.

+134 −93

File changed.

Preview size limit exceeded, changes collapsed.

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ type Websocket struct {
	Id                string                                       `json:"id"`
	State             string                                       `json:"state"`
	Endpoint          string                                       `json:"endpoint"`
	Uri               string                                       `json:"uri"`
	ConnectionHandler func(w http.ResponseWriter, r *http.Request) `json:"-"`
	Connection        *websocket.Conn                              `json:"-"`
	MsgHandler        chan []byte                                  `json:"-"`